Fix conflicts

2025-06-15 10:23:37 +00:00 · 2017-01-25 10:27:33 -08:00
parent 815e2f66dd d9ae66067a
commit 42b5a66708
241 changed files with 8621 additions and 2472 deletions
--- a/windows/manage/.vscode/settings.json
+++ b/windows/manage/.vscode/settings.json
@ -0,0 +1,3 @@
+// Place your settings in this file to overwrite default and user settings.
+{
+}
--- a/windows/manage/TOC.md
+++ b/windows/manage/TOC.md
@ -1,7 +1,21 @@
 # [Manage and update Windows 10](index.md)
 ## [Administrative Tools in Windows 10](administrative-tools-in-windows-10.md)
-## [Cortana integration in your business or enterprise](manage-cortana-in-enterprise.md)
+## [Cortana integration in your business or enterprise](cortana-at-work-overview.md)
+### [Testing scenarios using Cortana in your business or organization](cortana-at-work-testing-scenarios.md)
+#### [Test scenario 1 - Sign-in to Azure AD and use Cortana to manage the notebook](cortana-at-work-scenario-1.md)
+#### [Test scenario 2 - Test scenario 2 - Perform a quick search with Cortana at work](cortana-at-work-scenario-2.md)
+#### [Test scenario 3 - Set a reminder for a specific location using Cortana at work](cortana-at-work-scenario-3.md)
+#### [Test scenario 4 - Use Cortana at work to find your upcoming meetings](cortana-at-work-scenario-4.md)
+#### [Test scenario 5 - Use Cortana to send email to a co-worker](cortana-at-work-scenario-5.md)
+#### [Test scenario 6 - Use Cortana and Windows Information Protection (WIP) to help protect your organization’s data on a device](cortana-at-work-scenario-6.md)
+### [Set up and test Cortana with Office 365 in your organization](cortana-at-work-o365.md)
+### [Set up and test Cortana with Microsoft Dynamics CRM (Preview feature) in your organization](cortana-at-work-crm.md)
+### [Set up and test Cortana for Power BI in your organization](cortana-at-work-powerbi.md)
+### [Set up and test custom voice commands in Cortana for your organization](cortana-at-work-voice-commands.md)
+### [Use Group Policy and mobile device management (MDM) settings to configure Cortana in your organization](cortana-at-work-policy-settings.md)
+### [Send feedback about Cortana at work back to Microsoft](cortana-at-work-feedback.md)
 ## [Update Windows 10 in the enterprise](waas-update-windows-10.md)
+### [Quick guide to Windows as a service](waas-quick-start.md)
 ### [Overview of Windows as a service](waas-overview.md)
 ### [Prepare servicing strategy for Windows 10 updates](waas-servicing-strategy-windows-10-updates.md)
 ### [Build deployment rings for Windows 10 updates](waas-deployment-rings-windows-10-updates.md)
@ -24,13 +38,15 @@
 ### [Manage Windows 10 and Windows Store tips, tricks, and suggestions](manage-tips-and-suggestions.md)
 ### [New policies for Windows 10](new-policies-for-windows-10.md)
 ### [Group Policies that apply only to Windows 10 Enterprise and Windows 10 Education](group-policies-for-enterprise-and-education-editions.md)
-### [Changes to Group Policy settings for Windows 10 Start](changes-to-start-policies-in-windows-10.md)
+### [Changes to Group Policy settings for Windows 10 Start menu](changes-to-start-policies-in-windows-10.md)
 ### [Windows 10 Mobile and MDM](windows-10-mobile-and-mdm.md)
 ### [Introduction to configuration service providers (CSPs)](how-it-pros-can-use-configuration-service-providers.md)
 ## [Windows Spotlight on the lock screen](windows-spotlight.md)
 ## [Manage Windows 10 Start and taskbar layout](windows-10-start-layout-options-and-policies.md)
 ### [Configure Windows 10 taskbar](configure-windows-10-taskbar.md)
 ### [Customize and export Start layout](customize-and-export-start-layout.md)
+### [Start layout XML for desktop editions of Windows 10 (reference)](start-layout-xml-desktop.md)
+### [Start layout XML for mobile editions of Windows 10 (reference)](start-layout-xml-mobile.md)
 ### [Customize Windows 10 Start and taskbar with Group Policy](customize-windows-10-start-screens-by-using-group-policy.md)
 ### [Customize Windows 10 Start and taskbar with ICD and provisioning packages](customize-windows-10-start-screens-by-using-provisioning-packages-and-icd.md)
 ### [Customize Windows 10 Start with mobile device management (MDM)](customize-windows-10-start-screens-by-using-mobile-device-management.md)
--- a/windows/manage/administrative-tools-in-windows-10.md
+++ b/windows/manage/administrative-tools-in-windows-10.md
@ -26,9 +26,6 @@ The tools in the folder might vary depending on which edition of Windows you are

 These tools were included in previous versions of Windows and the associated documentation for each tool should help you use these tools in Windows 10. The following list links to documentation for each tool.

-**Tip**  
-If the content that is linked to a tool in the following list doesn't provide the information you need to use that tool, send us a comment by using the **Was this page helpful?** feature on this **Administrative Tools in Windows 10** page. Details about the information you want for a tool will help us plan future content.
-
  

 -   [Component Services]( https://go.microsoft.com/fwlink/p/?LinkId=708489)
@ -49,7 +46,8 @@ If the content that is linked to a tool in the following list doesn't provide th
 -   [Windows Firewall with Advanced Security](https://go.microsoft.com/fwlink/p/?LinkId=708503)
 -   [Windows Memory Diagnostic]( https://go.microsoft.com/fwlink/p/?LinkId=708507)

- 
+>[!TIP]  
+>If the content that is linked to a tool in the following list doesn't provide the information you need to use that tool, send us a comment by using the **Was this page helpful?** feature on this **Administrative Tools in Windows 10** page. Details about the information you want for a tool will help us plan future content. 

  

--- a/windows/manage/change-history-for-manage-and-update-windows-10.md
+++ b/windows/manage/change-history-for-manage-and-update-windows-10.md
@ -12,6 +12,27 @@ author: jdeckerMS

 This topic lists new and updated topics in the [Manage and update Windows 10](index.md) documentation for [Windows 10 and Windows 10 Mobile](../index.md).

+>If you're looking for **update history** for Windows 10, see [Windows 10 and Windows Server 2016 update history](https://support.microsoft.com/help/12387/windows-10-update-history).
+
+## January 2017
+
+| New or changed topic | Description |
+| --- | --- |
+| [Cortana integration in your business or enterprise](cortana-at-work-overview.md) | New |
+| [Start layout XML for desktop editions of Windows 10](start-layout-xml-desktop.md) | New (previously published in Hardware Dev Center on MSDN) |
+| [Start layout XML for mobile editions of Windows 10](start-layout-xml-mobile.md) | New (previously published in Hardware Dev Center on MSDN) |
+| [Quick guide to Windows as a service](waas-quick-start.md) | Added video that explains how Windows as a service works. |
+
+
+
+## December 2016
+
+| New or changed topic | Description |
+| --- | --- |
+| [Quick guide to Windows as a service](waas-quick-start.md) | New |
+| [Manage Windows 10 in your organization - transitioning to modern management](manage-windows-10-in-your-organization-modern-management.md)  | Added video demonstration of the latest in modern management for Windows 10 |
+| [Windows Store for Business overview](windows-store-for-business-overview.md)   | Updated list of supported markets. |
+
 ## November 2016

 | New or changed topic | Description |
--- a/windows/manage/changes-to-start-policies-in-windows-10.md
+++ b/windows/manage/changes-to-start-policies-in-windows-10.md
@ -1,5 +1,5 @@
 ---
-title: Changes to Group Policy settings for Windows 10 Start (Windows 10)
+title: Changes to Group Policy settings for Windows 10 Start menu (Windows 10)
 description: Windows 10 has a brand new Start experience.
 ms.assetid: 612FB68A-3832-451F-AA97-E73791FEAA9F
 keywords: ["group policy", "start menu", "start screen"]
--- a/windows/manage/configure-devices-without-mdm.md
+++ b/windows/manage/configure-devices-without-mdm.md
@ -104,11 +104,14 @@ When you run Windows ICD, you have several options for creating your package.
 6. Toggle **On** or **Off** for wireless network connectivity. If you select **On**, enter the SSID, type, and (if required) password for the wireless network.
 7. Click **Enroll into Active Directory**.
 8. Toggle **Yes** or **No** for Active Directory enrollment. If you select **Yes**, enter the credentials for an account with permissions to enroll the device. (Optional) Enter a user name and password to create a local administrator account.
+
    > [!WARNING]
    > If you don't create a local administrator account and the device fails to enroll in Active Directory for any reason, you will have to reimage the device and start over. As a best practice, we recommend:
-    - Use a least-privileged domain account to join the device to the domain.
-    - Create a temporary administrator account to use for debugging or reprovisioning if the device fails to enroll successfully.
-    - [Use Group Policy to delete the temporary administrator account](https://blogs.technet.microsoft.com/canitpro/2014/12/10/group-policy-creating-a-standard-local-admin-account/) after the device is enrolled in Active Directory.
+    >
+    >- Use a least-privileged domain account to join the device to the domain.
+    >- Create a temporary administrator account to use for debugging or reprovisioning if the device fails to enroll successfully.
+    >- [Use Group Policy to delete the temporary administrator account](https://blogs.technet.microsoft.com/canitpro/2014/12/10/group-policy-creating-a-standard-local-admin-account/) after the device is enrolled in Active Directory.
+    
 9. Click **Finish**.
 10. Review your settings in the summary. You can return to previous pages to change your selections. Then, under **Protect your package**, toggle **Yes** or **No** to encrypt the provisioning package. If you select **Yes**, enter a password. This password must be entered to apply the encrypted provisioning package.
 11. Click **Create**.
--- a/windows/manage/configure-windows-10-taskbar.md
+++ b/windows/manage/configure-windows-10-taskbar.md
@ -17,14 +17,14 @@ Starting in Windows 10, version 1607, administrators can pin additional apps to

 You can specify different taskbar configurations based on device locale and region. There is no limit on the number of apps that you can pin. You specify apps using the [Application User Model ID (AUMID)](https://go.microsoft.com/fwlink/p/?LinkId=614867) or Desktop Application Link Path (the local path to the application). 

-If you specify an app to be pinned that is not installed on the computer, it won't appear on the taskbar.
+If you specify an app to be pinned that is not provisioned for the user on the computer, the pinned icon won't appear on the taskbar.

-The order of apps in the xml file dictates order of apps on taskbar from left to right, to the right of any existing apps pinned by user.
+The order of apps in the XML file dictates the order of pinned apps on the taskbar from left to right, to the right of any existing apps pinned by the user.

 > [!NOTE]
 > In operating systems configured to use a right-to-left language, the taskbar order will be reversed.

-The following example shows how apps will be pinned: Windows default apps to the left (blue circle), apps pinned by the user in the center (orange triangle), and apps that you pin using XML to the right (green square).
+The following example shows how apps will be pinned: Windows default apps to the left (blue circle), apps pinned by the user in the center (orange triangle), and apps that you pin using the XML file to the right (green square).

 ![Windows left, user center, enterprise to the right](images/taskbar-generic.png)

@ -41,21 +41,21 @@ To configure the taskbar:
 3. Apply the layout modification XML file to devices using [Group Policy](customize-windows-10-start-screens-by-using-group-policy.md) or a [provisioning package created in Windows Imaging and Configuration Designer (Windows ICD)](customize-windows-10-start-screens-by-using-provisioning-packages-and-icd.md).

 >[!IMPORTANT]
->If you use a provisioning package to configure the taskbar, your configuration will be reapplied each time the explorer.exe process restarts. If your configuration pins an app and the user unpins that app, the user's change will be overwritten the next time the configuration is applied. To apply a taskbar configuration and allow users to make changes that will persist, apply your configuration by using Group Policy.
+>If you use a provisioning package to configure the taskbar, your configuration will be reapplied each time the explorer.exe process restarts. If your configuration pins an app and the user then unpins that app, the user's change will be overwritten the next time the configuration is applied. To apply a taskbar configuration that allows users to make changes that will persist, apply your configuration by using Group Policy.

 ### Tips for finding AUMID and Desktop Application Link Path

 In the layout modification XML file, you will need to add entries for applications in the XML markup. In order to pin an application, you need either its AUMID or Desktop Application Link Path. 

 The easiest way to find this data for an application is to:
-1.	Pin the application to the Start menu
+1.	Pin the application to the Start menu on a reference or testing PC.
 2. 	Open Windows PowerShell and run the `Export-StartLayout` cmdlet. 
 3.	Open the generated XML file. 
-4.	Look for an entry corresponding to the app you pinned .
+4.	Look for an entry corresponding to the app you pinned.
 5.	Look for a property labeled `AppUserModelID` or `DesktopApplicationLinkPath`. 


-### Sample taskbar configuration XML
+### Sample taskbar configuration XML file

 ```xml
 <?xml version="1.0" encoding="utf-8"?>
@ -75,7 +75,7 @@ The easiest way to find this data for an application is to:
 </CustomTaskbarLayoutCollection>
 </LayoutModificationTemplate>
 ```
-### Sample taskbar configuration added to Start layout XML
+### Sample taskbar configuration added to Start layout XML file

 ```xml
 <?xml version="1.0" encoding="utf-8"?>
@ -139,7 +139,7 @@ The `<CustomTaskbarLayoutCollection>` section will append listed apps to the tas
 
 ![additional apps pinned to taskbar](images/taskbar-default-plus.png)

-##Remove default apps and add your own
+## Remove default apps and add your own

 By adding `PinListPlacement="Replace"` to `<CustomTaskbarLayoutCollection>`, you remove all default pinned apps; only the apps that you specify will be pinned to the taskbar.

@ -218,7 +218,7 @@ The following example shows you how to configure taskbars by country or region.

 ```

-When the preceding example XML is applied, the resulting taskbar for computers in the US or UK:
+When the preceding example XML file is applied, the resulting taskbar for computers in the US or UK:

 ![taskbar for US and UK locale](images/taskbar-region-usuk.png)

@ -289,7 +289,9 @@ The resulting taskbar for computers in any other country region:

 ## Related topics

-[Manage Windows 10 Start and taskbar layout ](windows-10-start-layout-options-and-policies.md)[Customize and export Start layout](customize-and-export-start-layout.md)
+[Manage Windows 10 Start and taskbar layout ](windows-10-start-layout-options-and-policies.md)
+
+[Customize and export Start layout](customize-and-export-start-layout.md)

 [Customize Windows 10 Start and taskbar with Group Policy](customize-windows-10-start-screens-by-using-group-policy.md)

--- a/windows/manage/configure-windows-telemetry-in-your-organization.md
+++ b/windows/manage/configure-windows-telemetry-in-your-organization.md
@ -148,6 +148,7 @@ The following table defines the endpoints for telemetry services:
 | Connected User Experience and Telemetry component | v10.vortex-win.data.microsoft.com<br />settings-win.data.microsoft.com |
 | [Windows Error Reporting](http://msdn.microsoft.com/library/windows/desktop/bb513641.aspx) | watson.telemetry.microsoft.com |
 | [Online Crash Analysis](http://msdn.microsoft.com/library/windows/desktop/ee416349.aspx) | oca.telemetry.microsoft.com |
+| OneDrive app for Windows 10 | vortex.data.microsoft.com/collect/v1 |

 ### Data use and access

--- a/windows/manage/connect-to-remote-aadj-pc.md
+++ b/windows/manage/connect-to-remote-aadj-pc.md
@ -25,7 +25,7 @@ From its release, Windows 10 has supported remote connections to PCs that are jo
 ## Set up

 - Both PCs (local and remote) must be running Windows 10, version 1607. Remote connection to an Azure AD-joined PC that is running earlier versions of Windows 10 is not supported.
- Ensure [Remote Credential Guard](../keep-secure/remote-credential-guard.md), a new feature in Windows 10, version 1607, is turned off on the client PC.
+- Ensure [Remote Credential Guard](../keep-secure/remote-credential-guard.md), a new feature in Windows 10, version 1607, is turned off on the client PC that you are using to connect to the remote PC.
 - On the PC that you want to connect to:
  1. Open system properties for the remote PC. 
  2. Enable **Allow remote connections to this computer** and select **Allow connections only from computers running Remote Desktop with Network Level Authentication**. 
--- a/windows/manage/cortana-at-work-crm.md
+++ b/windows/manage/cortana-at-work-crm.md
@ -0,0 +1,62 @@
+---
+title: Set up and test Cortana with Microsoft Dynamics CRM (Preview feature) in your organization (Windows 10)
+description: How to set up Cortana to help your salespeople get proactive insights on important CRM activities, including sales leads, accounts, and opportunities; presenting the most relevant info at any given time.
+ms.prod: w10
+ms.mktglfcycl: manage
+ms.sitesec: library
+localizationpriority: high
+---
+
+# Set up and test Cortana with Microsoft Dynamics CRM (Preview feature) in your organization
+**Applies to:**
+
+-   Windows 10, Windows Insider Program 
+-   Windows 10 Mobile, Windows Insider Program
+
+>[!IMPORTANT]
+>Some information relates to prereleased product which may be substantially modified before it's commercially released. Microsoft makes no warranties, express or implied, with respect to the information provided here.
+
+Cortana integration is a Preview feature that's available for your test or dev environment, starting with the CRM Online 2016 Update. If you decide to use this Preview feature, you'll need to turn in on and accept the license terms. After that, your salespeople will get proactive insights from Cortana on important CRM activities, including sales leads, accounts, and opportunities; presenting the most relevant info at any given time. This can even include getting company-specific news that surfaces when the person is meeting with a representative from another company.
+
+>[!NOTE]
+>For more info about Dynamics CRM integration, how to turn on Cortana, and how to provide feedback, see [Preview feature: Set up Cortana integration](http://go.microsoft.com/fwlink/p/?LinkId=746819).
+
+![Cortana at work, showing the sales data pulled from Dynamics CRM](images/cortana-crm-screen.png)
+
+## Turn on Cortana with Dynamics CRM in your organization
+You must be a CRM administrator to turn on and use Preview features. For more info about what Preview features are and how to use them, see [What are Preview features and how do I enable them](http://go.microsoft.com/fwlink/p/?LinkId=746817)?
+
+**To turn on Cortana with Dynamics CRM**
+
+1.	Go to **Settings**, and then click **Administration**.
+
+2.	Choose **System Settings**, and then click the **Previews** tab.
+
+3.	Read the license terms, and if you agree, select the **I’ve read and agree to the license terms** check box.
+
+4.	For each preview feature you want to enable, click **Yes**.
+
+## Turn on Cortana with Dynamics CRM on your employees’ devices
+You must tell your employees to turn on Cortana, before they’ll be able to use it with Dynamics CRM.
+
+**To turn on local Cortana with Dynamics CRM**
+
+1.	Click on the **Cortana** search box in the taskbar, and then click the **Notebook** icon.
+
+2.	Click on **Connected Services**, click **Dynamics CRM**, and then click **Connect**.
+
+    ![Cotana at work, showing how to turn on the connected services for Dynamics CRM](images/cortana-connect-crm.png)
+ 	 
+    The employee can also disconnect by clicking **Disconnect** from the **Dynamics CRM** screen.
+
+## Turn off Cortana with Dynamics CRM
+Cortana can only access data in Dynamics CRM when it’s turned on. If you don’t want Cortana to access your corporate data, you can turn it off.
+
+**To turn off Cortana with Dynamics CRM**
+1.	Go to **Settings**, and then click **Administration**.
+
+2.	Choose **System Settings**, and then click the **Previews** tab.
+
+3.	Click **No** for **Cortana**.
+
+    All Dynamics CRM functionality related to Cortana is turned off in your organization.
--- a/windows/manage/cortana-at-work-feedback.md
+++ b/windows/manage/cortana-at-work-feedback.md
@ -0,0 +1,24 @@
+---
+title: Send feedback about Cortana at work back to Microsoft (Windows 10)
+description: How to send feedback to Microsoft about Cortana at work.
+ms.prod: w10
+ms.mktglfcycl: manage
+ms.sitesec: library
+localizationpriority: high
+---
+
+# Send feedback about Cortana at work back to Microsoft
+**Applies to:**
+
+-   Windows 10, Windows Insider Program 
+-   Windows 10 Mobile, Windows Insider Program
+
+>[!IMPORTANT]
+>Some information relates to prereleased product which may be substantially modified before it's commercially released. Microsoft makes no warranties, express or implied, with respect to the information provided here.
+
+We ask that you report bugs and issues. To provide feedback, you can click the **Feedback** icon in the Cortana window. When you send this form to Microsoft it also includes troubleshooting info, in case you run into problems.
+
+![Cortana at work, showing how to provide feedback to Microsoft](images/cortana-feedback.png)
+ 
+If you don't want to use the feedback tool in Cortana, you can add feedback through the general Windows Insider Preview feedback app. For info about the Insider Preview feedback app, see [How to use Windows Insider Preview – Updates and feedback](http://windows.microsoft.com/en-us/windows/preview-updates-feedback-pc).
+
--- a/windows/manage/cortana-at-work-o365.md
+++ b/windows/manage/cortana-at-work-o365.md
@ -0,0 +1,72 @@
+---
+title: Set up and test Cortana with Office 365 in your organization (Windows 10)
+description: How to connect Cortana to Office 365 so your employees are notified about regular meetings, unusual events, such as meetings over lunch or during a typical commute time, and about early meetings, even setting an alarm so the employee isn’t late.
+ms.prod: w10
+ms.mktglfcycl: manage
+ms.sitesec: library
+localizationpriority: high
+---
+
+# Set up and test Cortana with Office 365 in your organization
+**Applies to:**
+
+-   Windows 10, Windows Insider Program 
+-   Windows 10 Mobile, Windows Insider Program
+
+>[!IMPORTANT]
+>Some information relates to prereleased product which may be substantially modified before it's commercially released. Microsoft makes no warranties, express or implied, with respect to the information provided here.
+
+Cortana in Windows 10 is already great at letting your employees quickly see what the day is going to look like, do meeting prep work like researching people in LinkedIn or getting documents ready, see where and when their meetings are going to be, get a sense of travel times to and from work, and even get updates from a calendar for upcoming trips.
+
+But Cortana works even harder when she connects to Office 365, helping employees to be notified about unusual events, such as meetings over lunch or during a typical commute time, and about early meetings, even setting an alarm so the employee isn’t late.
+
+![Cortana at work, showing the day's schedule pulled from Office 365](images/cortana-o365-screen.png)
+
+We’re continuing to add more and more capabilities to Cortana so she can become even more helpful with your productivity-related tasks, such as emailing, scheduling, and other tasks that are important to help you be successful.
+
+>[!NOTE]
+>For a quick review of the frequently asked questions about Cortana and Office 365 integration, see the blog post, [An early look at Cortana integration with Office 365](http://go.microsoft.com/fwlink/p/?LinkId=717379).
+
+## Before you begin
+There are a few things to be aware of before you start using Cortana with Office 365 in your organization.
+
+- **Software requirements.** O365 integration with Cortana is available in all countries/regions where Cortana is supported for consumers today. This includes the United States, United Kingdom, Canada, France, Italy, Germany, Spain, China, Japan, India, and Australia. As Cortana comes to more countries, it will also become available to organizations.
+
+- **Azure Active Directory (Azure AD) account.** Before your employees can use Cortana in your org, they must be logged in using their Azure AD account through Cortana’s notebook. They must also authorize Cortana to access Office 365 on their behalf.
+
+- **Office 365 Trust Center.** Cortana isn't a service covered by the Office 365 Trust Center. [Learn more about how Cortana treats your data](http://go.microsoft.com/fwlink/p/?LinkId=536419).
+
+- **Troubleshooting tips.** If you run into issues, check out these [troubleshooting tips](http://go.microsoft.com/fwlink/p/?LinkId=620763).
+
+## Turn on Cortana with Office 365 on employees’ devices
+You must tell your employees to turn on Cortana before they’ll be able to use it with Office 365.
+
+**To turn on local Cortana with Office 365**
+
+1.	Click on the **Cortana** search box in the taskbar, and then click the **Notebook** icon.
+
+2.	Click on **Connected Services**, click **Office 365**, and then click **Connect**.
+
+    ![Cotana at work, showing how to turn on the connected services for Office 365](images/cortana-connect-o365.png)
+ 	 
+    The employee can also disconnect by clicking **Disconnect** from the **Office 365** screen.
+
+## Turn off Cortana with Office 365
+Cortana can only access data in your Office 365 org when it’s turned on. If you don’t want Cortana to access your corporate data, you can turn it off in the Office 365 admin center.
+
+**To turn off Cortana with Office 365**
+1.	[Sign in to Office 365](http://www.office.com/signin) using your Azure AD account.
+
+2.	Go to the [Office 365 admin center](https://support.office.com/en-us/article/Office-365-admin-center-58537702-d421-4d02-8141-e128e3703547).
+
+3.	Expand **Service Settings**, and select **Cortana**.
+
+4.	Click **Cortana** to toggle Cortana off.
+
+    All Office 365 functionality related to Cortana is turned off in your organization and your employees are unable to use her at work.
+
+
+
+
+
+
--- a/windows/manage/cortana-at-work-overview.md
+++ b/windows/manage/cortana-at-work-overview.md
@ -0,0 +1,64 @@
+---
+title: Cortana integration in your business or enterprise (Windows 10)
+description: The world’s first personal digital assistant helps users get things done, even at work. Cortana includes powerful configuration options specifically to optimize for unique small to medium-sized business and enterprise environments.
+ms.prod: w10
+ms.mktglfcycl: manage
+ms.sitesec: library
+localizationpriority: high
+---
+
+# Cortana integration in your business or enterprise
+**Applies to:**
+
+-   Windows 10, Windows Insider Program 
+-   Windows 10 Mobile, Windows Insider Program
+
+>[!IMPORTANT]
+>Some information relates to prereleased product which may be substantially modified before it's commercially released. Microsoft makes no warranties, express or implied, with respect to the information provided here.
+
+## Who is Cortana?
+Cortana is Microsoft’s personal digital assistant, who helps busy people get things done, even while at work. 
+Cortana has powerful configuration options, specifically optimized for your business. By signing in with an Azure Active Directory (Azure AD) account, your employees can give Cortana access to their enterprise/work identity, while getting all the functionality Cortana provides to them outside of work.
+
+Using Azure AD also means that you can remove an employee’s profile (for example, when an employee leaves your organization) while respecting Windows Information Protection (WIP) policies and ignoring enterprise content, such as emails, calendar items, and people lists that are marked as enterprise data.
+
+![Cortana at work, showing the About me screen](images/cortana-about-me.png)
+
+## Where is Cortana available for use in my organization?
+You can use Cortana at work in all countries/regions where Cortana is supported for consumers. This includes the United States, United Kingdom, Canada, France, Italy, Germany, Spain, China, Japan, India, and Australia. As Cortana comes to more countries, she will also become available to enterprise customers.
+
+Cortana is available on Windows 10, Windows Insider Program and with limited functionality on Windows Phone 8.1, Windows Insider Program.
+
+## Required hardware and software
+Cortana requires the following hardware and software to successfully run the included scenario in your organization.
+
+|Hardware |Description |
+|---------|------------|
+|Microphone |For speech interaction with Cortana. If you don't have a microphone, you can still interact with Cortana by typing in the Cortana Search Box in the taskbar. |
+|Windows Phone |For location-specific reminders. You can also use a desktop device to run through this scenario, but location accuracy is usually better on phones. |
+|Desktop devices |For non-phone-related scenarios. |
+
+
+|Software |Minimum version |
+|---------|------------|
+|Client operating system |<ul><li>**Desktop:** Windows 10, Windows Insider Program</li><li>**Mobile:** Windows 8.1, Windows Insider Program (with limited functionality)</li> |
+|Azure Active Directory (Azure AD) |While all employees signing into Cortana need an Azure AD account; an Azure AD premium tenant isn’t required. |
+|Additional policies (Group Policy and Mobile Device Management (MDM)) |There is a rich set of policies that can be used to manage various aspects of Cortana. Most of these policies will limit the abilities of Cortana, but won't turn Cortana off.<p>For example:<p>If you turn **Location** off, Cortana won't be able to provide location-based reminders, such as reminding you to visit the mail room when you get to work.<p>If you turn **Speech** off, your employees won't be able to use “Hello Cortana” for hands free usage or voice commands to easily ask for help. |
+|Windows Information Protection (WIP) (optional) |If you want to secure the calendar, email, and contact info provided to Cortana on a device, you can use WIP. For more info about WIP, see [Protect your enterprise data using Windows Information Protection (WIP)](../keep-secure/protect-enterprise-data-using-wip.md)<p>If you decide to use WIP, you must also have a management solution. This can be Microsoft Intune, Microsoft System Center Configuration Manager (version 1606 or later), or your current company-wide 3rd party mobile device management (MDM) solution.|
+
+## Signing in using Azure AD
+Your organization must have an Azure AD tenant and your employees’ devices must all be Azure AD-joined for Cortana to work properly. For info about what an Azure AD tenant is, how to get your devices joined, and other Azure AD maintenance info, see [What is an Azure AD directory?](https://msdn.microsoft.com/library/azure/jj573650.aspx)
+
+## Cortana and privacy
+We understand that there are some questions about Cortana and your organization’s privacy, including concerns about what info is collected by Cortana, where the info is saved, how to manage what data is collected, how to turn Cortana off, how to opt completely out of data collection, and what info is shared with other Microsoft apps and services. For more details about these concerns, see the [Cortana, Search, and privacy: FAQ](http://windows.microsoft.com/windows-10/cortana-privacy-faq) topic.
+
+Cortana is covered under the [Microsoft Privacy Statement](https://privacy.microsoft.com/privacystatement) and [Microsoft Services Agreement](https://www.microsoft.com/en-us/servicesagreement).
+
+## See also
+- [What is Cortana?](http://go.microsoft.com/fwlink/p/?LinkId=746818)
+
+- [Cortana and Windows](http://go.microsoft.com/fwlink/?LinkId=717384)
+
+- [Known issues for Windows Desktop Search and Cortana in Windows 10](http://support.microsoft.com/kb/3206883/EN-US)
+
+- [Cortana for developers](http://go.microsoft.com/fwlink/?LinkId=717385)
--- a/windows/manage/cortana-at-work-policy-settings.md
+++ b/windows/manage/cortana-at-work-policy-settings.md
@ -0,0 +1,44 @@
+---
+title: Use Group Policy and mobile device management (MDM) settings to configure Cortana in your organization (Windows 10)
+description: The list of Group Policy and mobile device management (MDM) policy settings that apply to Cortana at work.
+ms.prod: w10
+ms.mktglfcycl: manage
+ms.sitesec: library
+localizationpriority: high
+---
+
+# Use Group Policy and mobile device management (MDM) settings to configure Cortana in your organization
+**Applies to:**
+
+-   Windows 10, Windows Insider Program 
+-   Windows 10 Mobile, Windows Insider Program
+
+>[!IMPORTANT]
+>Some information relates to prereleased product which may be substantially modified before it's commercially released. Microsoft makes no warranties, express or implied, with respect to the information provided here.
+
+>[!NOTE]
+>For specific info about how to set, manage, and use each of these MDM policies to configure Cortana in your enterprise, see the [Policy CSP](http://go.microsoft.com/fwlink/p/?LinkId=717380) topic, located in the configuration service provider reference topics. For specific info about how to set, manage, and use each of these Group Policies to configure Cortana in your enterprise, see the [Group Policy TechCenter](http://go.microsoft.com/fwlink/p/?LinkId=717381).
+
+|Group policy |MDM policy |Description |
+|-------------|-----------|------------|
+|Computer Configuration\Administrative Templates\Windows Components\Search\AllowCortanaAboveLock|AboveLock/AllowCortanaAboveLock|Specifies whether an employee can interact with Cortana using voice commands when the system is locked.<p>**NOTE**<br>This setting only applies to Windows 10 for desktop devices. |
+|Computer Configuration\Administrative Templates\Control Panel\Regional and Language Options\Allow input personalization|Privacy/AllowInputPersonalization|Specifies whether an employee can use voice commands with Cortana in your organization.<p>**In Windows 10, version 1511**<br>Cortana won’t work if this setting is turned off (disabled).<p>**In Windows 10, version 1607 and later**<br>Cortana still works if this setting is turned off (disabled).|
+|None|System/AllowLocation|Specifies whether to allow app access to the Location service.<p>**In Windows 10, version 1511**<br>Cortana won’t work if this setting is turned off (disabled).<p>**In Windows 10, version 1607 and later**<br>Cortana still works if this setting is turned off (disabled).|
+|None|Accounts/AllowMicrosoftAccountConnection|Specifies whether to allow employees to sign in using a Microsoft account (MSA) from Windows apps.<p>Use this setting if you only want to support Azure AD in your organization.|
+|Computer Configuration\Administrative Templates\Windows Components\Search\Allow search and Cortana to use location|Search/AllowSearchToUseLocation|Specifies whether Cortana can use your current location during searches and for location reminders.|
+|Computer Configuration\Administrative Templates\Windows Components\Search\Set the SafeSearch setting for Search|Search/SafeSearchPermissions|Specifies what level of safe search (filtering adult content) is required.<p>**NOTE**<br>This setting only applies to Windows 10 Mobile.|
+|User Configuration\Administrative Templates\Windows Components\File Explorer\Turn off display of recent search entries in the File Explorer search box|None|Specifies whether the search box can suggest recent queries and prevent entries from being stored in the registry for future reference.|
+|Computer Configuration\Administrative Templates\Windows Components\Search\Don't search the web or display web results|None|Specifies whether search can perform queries on the web and if the web results are displayed in search.<p>**In Windows 10 Pro edition**<br>This setting can’t be managed.<p>**In Windows 10 Enterprise edition**<br>Cortana won't work if this setting is turned off (disabled).|
+|Computer Configuration\Administrative Templates\Windows Components\Search\Allow Cortana|Experience/AllowCortana|Specifies whether employees can use Cortana.<p>**IMPORTANT**<br>Cortana won’t work if this setting is turned off (disabled). However, employees can still perform local searches even with Cortana turned off.|
+
+
+
+
+
+
+
+
+
+
+
+ 
--- a/windows/manage/cortana-at-work-powerbi.md
+++ b/windows/manage/cortana-at-work-powerbi.md
@ -0,0 +1,138 @@
+---
+title: Set up and test Cortana for Power BI in your organization (Windows 10)
+description: How to integrate Cortana with Power BI to help your employees get answers directly from your key business data.
+ms.prod: w10
+ms.mktglfcycl: manage
+ms.sitesec: library
+localizationpriority: high
+---
+
+# Set up and test Cortana for Power BI in your organization
+**Applies to:**
+
+-   Windows 10, Windows Insider Program 
+-   Windows 10 Mobile, Windows Insider Program
+
+>[!IMPORTANT]
+>Some information relates to prereleased product which may be substantially modified before it's commercially released. Microsoft makes no warranties, express or implied, with respect to the information provided here.
+
+Integration between Cortana and Power BI shows how Cortana can work with custom business analytics solutions to enable you to get answers directly from your key business data, including introducing new features that let you create custom Cortana “answers” using the full capabilities of Power BI Desktop.
+
+>[!Note]
+>Cortana for Power BI is currently only available in English. For more info about Cortana and Power BI, see [Use Power BI to create a custom Answer Page for Cortana](https://powerbi.microsoft.com/en-us/documentation/powerbi-service-cortana-desktop-entity-cards/).
+
+## Before you begin
+To use this walkthrough, you’ll need:
+
+- **Windows 10**. You’ll need to be running at least Windows 10 with the latest version from the Windows Insider Program.
+
+- **Cortana**. You need to have Cortana turned on and be logged into your account.
+
+- **Power BI account with data**. You can use an existing Power BI account, or else you can get a trial account by signing up at http://powerbi.com. Just make sure that either way, you enter some data that you can use.
+
+- **Azure Active Directory (Azure AD)/Work or School account**. You can use the account that you created for Office 365, or you can create a new one while you’re establishing your Power BI account. If you choose to use Azure AD, you must connect your Azure AD account to your Windows account.
+
+    **To connect your account to Windows**
+    a.	Open **Windows Settings**, click **Accounts**, click **Access work or school**, and then in the **Connect to work or school** section, click **Connect**.
+    
+    b.	Follow the instructions to add your Azure Active Directory (Azure AD) account to Windows.
+
+## Set up your test environment for Cortana for Power BI
+Before you can start this testing scenario, you must first set up your test environment and data, and then you must turn on and set up Cortana to connect and work with Power BI.
+
+**To set up your test environment with Cortana and Power BI**
+
+1. Go to http://powerbi.com and sign-in with the same O365 credentials you used in the Set up and use Cortana with Office 365 topic.
+
+2. Expand the left rail by clicking the **Show the navigation pane** icon.
+
+    ![Cortana at work, showing the navigation expand icon in Power BI](images/cortana-powerbi-expand-nav.png)
+
+3.	Click **Get Data** from the left-hand navigation in Power BI.
+
+    ![Cortana at work, showing the Get Data link](images/cortana-powerbi-getdata.png)
+
+4.	Click **Samples** from the **Content Pack Library** area of the **Get Data** screen.
+
+    ![Cortana at work, showing the Samples link](images/cortana-powerbi-getdata-samples.png)
+
+5.	Click **Retail Analysis Sample**, and then click **Connect**.
+
+    ![Cortana at work, showing the Samples link](images/cortana-powerbi-retail-analysis-sample.png)
+ 
+    The sample data is imported and you’re returned to the **Power BI** screen.
+
+6.	Click **Dashboards** from the left pane of the **Power BI** screen, and then click **Retail Analysis Sample**.
+
+    ![Cortana at work, showing a dashboard view of the sample data](images/cortana-powerbi-retail-analysis-dashboard.png)    
+ 
+7.	In the upper right-hand menu, click the **Settings** icon, and then click **Settings**.
+
+    ![Cortana at work, showing where to find the Settings option](images/cortana-powerbi-settings.png) 
+
+8.	Click the **Datasets** tab, and then pick the **Retail Analysis Sample** dataset from the list.
+
+9.	Click **Q&A and Cortana**, check the **Allow Cortana to access this dataset** box, and then click **Apply**.
+
+    ![Cortana at work, showing where to find the dataset options](images/cortana-powerbi-retail-analysis-dataset.png)
+
+    >[!NOTE]
+    >It can take up to 30 minutes for a new dataset to appear for Power BI and Cortana. Logging in and out of Windows 10, or otherwise restarting Cortana, causes the new content to appear immediately.<p>If you enable a dataset for Cortana, and that dataset is part of a content pack you own, you’ll need to re-publish for your colleagues to also use it with Cortana.
+
+## Create a custom Answer Page for Cortana
+You must create special reports, known as _Answer Pages_, to display the most commonly asked answers in Cortana. For example, if you want Cortana to quickly show sales data to your employees, you can create a 2016 sales data Answer Page that shows sales data, with various pivots, in Cortana.
+
+After you’ve finished creating your Answer Page, you can continue to the included testing scenarios.
+
+    >[!NOTE]
+    >It can take up to 30 minutes for a custom Answer Page to appear for Power BI and Cortana. Logging in and out of Windows 10, or otherwise restarting Cortana, causes the new content to appear immediately.
+
+**To create a custom sales data Answer Page for Cortana**
+1.	In Power BI, click **My Workspace**, click **Create**, and then click **Report**.
+
+    ![Cortana at work, showing where to create the new report](images/cortana-powerbi-create-report.png)
+ 
+2.	In the **Create Report** screen, click the **Retail Analysis Sample**, and then click **Create**.
+
+    A blank report page appears.
+
+3.	In the **Visualizations** pane, click the paint roller icon, expand **Page Size**, and then pick **Cortana** from the **Type** drop-down list.
+
+    ![Cortana at work, showing the Visualizations options](images/cortana-powerbi-pagesize.png)
+
+4.	In the **Fields** pane, click to expand **Sales**, expand **This year sales**, and then add both **Value** and **Goal**.
+
+    ![Cortana at work, showing the Field options](images/cortana-powerbi-field-selection.png)
+ 
+    The automatically generated graph is added to your blank report. You have the option to change colors, add borders, add additional visualizations, and modify this page so that it answers the question about sales data as precisely, and in as custom a way, as you want. You just need to make sure that it all stays within the page borders.
+
+5.	In the **Visualizations** pane, click the paint roller icon again, expand **Page Information**, type _Sales data 2016_ into the **Name** box, turn on **Q&A**, and then add alternate report names (separated by commas) into the text box.
+
+    The alternate names help Cortana to know what questions to look for and when to show this report. To also improve your results, you should avoid using the names of your report columns.
+
+    ![Cortana at work, showing the page info for your specific report](images/cortana-powerbi-report-qna.png)
+    
+6.	Click **File**, click **Save as**, and save the report as _Sales data 2016_. 
+
+    Because this is part of the Retail Analysis Sample, it will automatically be included as part of the dataset you included for Cortana. However, you will still need to log in and out of Windows 10, or otherwise restart Cortana, before the new content appears.
+
+## Test Scenario: Use Cortana to show info from Power BI in your organization
+Now that you’ve set up your device, you can use Cortana to show your info from within Power BI.
+
+**To use Cortana with Power BI**
+1.	Click on the **Cortana** icon in the taskbar, and then click in the **Search** bar.
+
+2.	Type _This year in sales_.
+
+    Cortana shows you the available results.
+
+    ![Cortana at work, showing the best matches based on the Power BI data](images/cortana-powerbi-search.png)
+ 	 
+3.	In the **Power BI** area, click **This year in sales – in Retail Analysis Sample**.
+
+ 	Cortana returns your custom report.
+
+    ![Cortana at work, showing your custom report from Power BI](images/cortana-powerbi-myreport.png)
+ 	 
+>[!NOTE]
+>For more info about how to connect your own data, build your own custom Power BI cards and Answer Pages for Cortana, and how to share the cards with everyone in your organization, see [Use Power BI to create a custom Answer Page for Cortana](https://powerbi.microsoft.com/en-us/documentation/powerbi-service-cortana-desktop-entity-cards/).
--- a/windows/manage/cortana-at-work-scenario-1.md
+++ b/windows/manage/cortana-at-work-scenario-1.md
@ -0,0 +1,58 @@
+---
+title: Test scenario 1 - Sign-in to Azure AD and use Cortana to manage the notebook (Windows 10)
+description: A test scenario walking you through signing in and managing the notebook.
+ms.prod: w10
+ms.mktglfcycl: manage
+ms.sitesec: library
+localizationpriority: high
+---
+
+# Test scenario 1 - Sign-in to Azure AD and use Cortana to manage the notebook
+
+-   Windows 10, Windows Insider Program 
+-   Windows 10 Mobile, Windows Insider Program
+
+>[!IMPORTANT]
+>Some information relates to prereleased product which may be substantially modified before it's commercially released. Microsoft makes no warranties, express or implied, with respect to the information provided here.
+
+>[!IMPORTANT]
+>The data created as part of these scenarios will be uploaded to Microsoft’s Cloud to help Cortana learn and help your employees. This is the same info that Cortana uses in the consumer offering.
+
+This scenario turns on Azure AD and let's your employee use Cortana to manage an entry in the notebook.
+
+## Turn on Azure AD
+This process helps you to sign out of a Microsoft Account and to sign into an Azure AD account.
+
+1.	Click on the **Cortana** icon in the taskbar, click the **Notebook**, and then click **About Me**.
+
+2.	Click your email address.
+
+    A dialog box appears, showing the associated account info.
+
+3.	Click your email address again, and then click **Sign out**.
+
+    This signs out the Microsoft account, letting you continue to add and use the Azure AD account.
+
+4.	Click the **Search** box and then the **Notebook** icon in the left rail. This will start the sign-in request.
+
+5.	Click **Sign-In** and follow the instructions.
+
+6.	When you’re asked to sign in, you’ll need to choose an Azure AD account, which will look like kelliecarlson@contoso.com.
+
+    >[!IMPORTANT]
+    >If there’s no Azure AD account listed, you’ll need to go to **Windows Settings > Accounts > Email & app accounts**, and then click **Add a work or school account** to add it.
+
+## Use Cortana to manage the notebook content
+This process helps you to manage the content Cortana shows in your Notebook.
+
+1.	Click on the **Cortana** icon in the taskbar, click the **Notebook**, scroll down and click **Weather**.
+
+2.	In the **Weather** settings, scroll down to the **Cities your tracking** area, and then click **Add a city**.
+
+3.	Add *Redmond, Washington*, double-click the search result, click **Add**, and then click **Save**.
+
+    ![Cortana at work, showing the multiple Weather screens](images/cortana-weather-multipanel.png)
+ 
+4.	Click on the **Home** icon and scroll to the weather forecast for Redmond, Washington.
+
+    ![Cortana at work, showing Redmond, WA weather](images/cortana-redmond-weather.png)
--- a/windows/manage/cortana-at-work-scenario-2.md
+++ b/windows/manage/cortana-at-work-scenario-2.md
@ -0,0 +1,41 @@
+---
+title: Test scenario 2 - Perform a quick search with Cortana at work (Windows 10)
+description: A test scenario about how to perform a quick search with Cortana at work.
+ms.prod: w10
+ms.mktglfcycl: manage
+ms.sitesec: library
+localizationpriority: high
+---
+
+# Test scenario 2 - Perform a quick search with Cortana at work
+
+-   Windows 10, Windows Insider Program 
+-   Windows 10 Mobile, Windows Insider Program
+
+>[!IMPORTANT]
+>Some information relates to prereleased product which may be substantially modified before it's commercially released. Microsoft makes no warranties, express or implied, with respect to the information provided here.
+
+>[!IMPORTANT]
+>The data created as part of these scenarios will be uploaded to Microsoft’s Cloud to help Cortana learn and help your employees. This is the same info that Cortana uses in the consumer offering.
+
+This scenario helps you perform a quick search using Cortana, both by typing and through voice commands.
+
+## Search using Cortana
+This process helps you use Cortana at work to perform a quick search.
+
+1. Click on the **Cortana** icon in the taskbar, and then click in the **Search** bar.
+
+2. Type *Weather in New York*.
+
+    You should see the weather in New York, New York at the top of the search results.
+
+    ![Cortana at work, showing the weather in New York, New York](images/cortana-newyork-weather.png)    
+ 
+## Search with Cortana, by using voice commands
+This process helps you to use Cortana at work and voice commands to perform a quick search.
+
+1. Click on the **Cortana** icon in the taskbar, and then click the **Microphone** icon (to the right of the **Search** box).
+
+2.	Say *What's the weather in Chicago?* Cortana tells you and shows you the current weather in Chicago.
+
+    ![Cortana at work, showing the current weather in Chicago, IL](images/cortana-chicago-weather.png)
--- a/windows/manage/cortana-at-work-scenario-3.md
+++ b/windows/manage/cortana-at-work-scenario-3.md
@ -0,0 +1,86 @@
+---
+title: Test scenario 3 - Set a reminder for a specific location using Cortana at work (Windows 10)
+description: A test scenario about how to set a location-based reminder using Cortana at work.
+ms.prod: w10
+ms.mktglfcycl: manage
+ms.sitesec: library
+localizationpriority: high
+---
+
+# Test scenario 3 - Set a reminder for a specific location using Cortana at work
+
+-   Windows 10, Windows Insider Program 
+-   Windows 10 Mobile, Windows Insider Program
+
+>[!IMPORTANT]
+>Some information relates to prereleased product which may be substantially modified before it's commercially released. Microsoft makes no warranties, express or implied, with respect to the information provided here.
+
+>[!IMPORTANT]
+>The data created as part of these scenarios will be uploaded to Microsoft’s Cloud to help Cortana learn and help your employees. This is the same info that Cortana uses in the consumer offering.
+
+This scenario helps you set up, review, and edit a reminder based on a location. For example, reminding yourself to grab your expense report receipts before you leave the house.
+
+>[!NOTE]
+>You can set each reminder location individually as you create the reminders, or you can go into the **About me** screen and add both **Work** and **Home** addresses as favorites. Make sure that you use real addresses since you’ll need to go to these locations to complete your testing scenario.<p>Additionally, if you’ve turned on the **Meeting & reminder cards & notifications** option (in the **Meetings & reminders** option of your Notebook), you’ll also see your pending reminders on the Cortana **Home** page.
+
+## Create a reminder for a specific location
+This process helps you to create a reminder based on a specific location.
+
+1. Click on the **Cortana** icon in the taskbar, click on the **Notebook** icon, and then click **Reminders**.
+
+2. Click the **+** sign, add a subject for your reminder, such as _Remember to file expense report receipts_, and then click **Place**.
+
+    ![Cortana at work, showing the add a reminder screens](images/cortana-add-reminder.png)
+ 
+3. Choose **Arrive** from the drop-down box, and then type a location to associate with your reminder. For example, you can use the physical address of where you work. Just make sure you can physically get to your location, so you can test the reminder.
+
+    ![Cortana at work, showing how to add a place to the reminder screens](images/cortana-place-reminder.png)
+ 
+4. Click **Done**.
+
+    >[!NOTE]
+    >If you’ve never used this location before, you’ll be asked to add a name for it so it can be added to the **Favorites list** in Windows Maps.
+
+5. Choose to be reminded the **Next time you arrive at the location** or on a specific day of the week from the drop-down box.
+
+6. Take a picture of your receipts and store them locally on your device.
+
+7. Click **Add Photo**, click **Library**, browse to your picture, and then click **OK**.
+
+    The photo is stored with the reminder.
+
+    ![Cortana at work, showing the stored image in the reminder screens](images/cortana-final-reminder.png)
+ 
+8. Review the reminder info, and then click **Remind**.
+
+    The reminder is saved and ready to be triggered.
+
+    ![Cortana at work, showing the final reminder](images/cortana-reminder-pending.png)
+
+## Create a reminder for a specific location by using voice commands
+This process helps you to use Cortana at work and voice commands to create a reminder for a specific location.
+
+1. Click on the **Cortana** icon in the taskbar, and then click the **Microphone** icon (to the right of the **Search** box).
+
+2. Say _Remind me to grab my expense report receipts before I leave home_. 
+
+    Cortana opens a new reminder task and asks if it sounds good.
+
+    ![Cortana at work, showing the reminder created through voice commands](images/cortana-reminder-mic.png)
+
+3. Say _Yes_ so Cortana can save the reminder.
+
+    ![Cortana at work, showing the final reminder created through voice commands](images/cortana-reminder-pending-mic.png)
+
+## Edit or archive an existing reminder
+This process helps you to edit or archive and existing or completed reminder.
+
+1. Click on the **Cortana** icon in the taskbar, click on the **Notebook** icon, and then click **Reminders**.
+
+    ![Cortana at work, showing the list of pending reminders](images/cortana-reminder-list.png)
+
+2. Click the pending reminder you want to edit.
+
+    ![Cortana at work, showing the reminder editing screen](images/cortana-reminder-edit.png)
+
+3.	Change any text that you want to change, click **Add photo** if you want to add or replace an image, click **Delete** if you want to delete the entire reminder, click **Save** to save your changes, and click **Complete and move to History** if you want to save a completed reminder in your **Reminder History**.
--- a/windows/manage/cortana-at-work-scenario-4.md
+++ b/windows/manage/cortana-at-work-scenario-4.md
@ -0,0 +1,51 @@
+---
+title: Test scenario 4 - Use Cortana at work to find your upcoming meetings (Windows 10)
+description: A test scenario about how to use Cortana at work to find your upcoming meetings.
+ms.prod: w10
+ms.mktglfcycl: manage
+ms.sitesec: library
+localizationpriority: high
+---
+
+# Test scenario 4 - Use Cortana at work to find your upcoming meetings
+
+-   Windows 10, Windows Insider Program 
+-   Windows 10 Mobile, Windows Insider Program
+
+>[!IMPORTANT]
+>Some information relates to prereleased product which may be substantially modified before it's commercially released. Microsoft makes no warranties, express or implied, with respect to the information provided here.
+
+>[!IMPORTANT]
+>The data created as part of these scenarios will be uploaded to Microsoft’s Cloud to help Cortana learn and help your employees. This is the same info that Cortana uses in the consumer offering.
+
+This scenario helps you search for both general upcoming meetings, and specific meetings, both manually and verbally.
+
+>[!NOTE]
+>If you’ve turned on the **Meeting & reminder cards & notifications** option (in the **Meetings & reminders** option of your Notebook), you’ll also see your pending reminders on the Cortana **Home** page.
+
+## Find out about upcoming meetings
+This process helps you find your upcoming meetings.
+
+1. Check to make sure your work calendar is connected and synchronized with your Azure AD account.
+
+2. Click on the **Cortana** icon in the taskbar, and then click in the **Search** bar.
+
+3. Type _Show me my meetings for tomorrow_.
+
+    You’ll see all your meetings scheduled for the next day.
+
+    ![Cortana at work, showing all upcoming meetings](images/cortana-meeting-tomorrow.png)
+
+## Find out about upcoming meetings by using voice commands
+This process helps you to use Cortana at work and voice commands to find your upcoming meetings.
+
+1.	Click on the **Cortana** icon in the taskbar, and then click the **Microphone** icon (to the right of the **Search** box.
+
+2.	Say _Show me what meeting I have at 3pm tomorrow_.
+
+    >[!IMPORTANT]
+    >Make sure that you have a meeting scheduled for the time you specify here.
+
+    ![Cortana at work, showing the meeting scheduled for 3pm](images/cortana-meeting-specific-time.png)
+
+
--- a/windows/manage/cortana-at-work-scenario-5.md
+++ b/windows/manage/cortana-at-work-scenario-5.md
@ -0,0 +1,57 @@
+---
+title: Test scenario 5 - Use Cortana to send email to a co-worker (Windows 10)
+description: A test scenario about how to use Cortana at work to send email to a co-worker.
+ms.prod: w10
+ms.mktglfcycl: manage
+ms.sitesec: library
+localizationpriority: high
+---
+
+# Test scenario 5 - Use Cortana to send email to a co-worker
+
+-   Windows 10, Windows Insider Program 
+-   Windows 10 Mobile, Windows Insider Program
+
+>[!IMPORTANT]
+>Some information relates to prereleased product which may be substantially modified before it's commercially released. Microsoft makes no warranties, express or implied, with respect to the information provided here.
+
+>[!IMPORTANT]
+>The data created as part of these scenarios will be uploaded to Microsoft’s Cloud to help Cortana learn and help your employees. This is the same info that Cortana uses in the consumer offering.
+
+This scenario helps you to send an email to a co-worker listed in your work address book, both manually and verbally.
+
+## Send an email to a co-worker
+This process helps you to send a quick message to a co-worker from the work address book.
+
+1.	Check to make sure your Microsoft Outlook or mail app is connected and synchronized with your Azure AD account.
+
+2.	Click on the **Cortana** icon in the taskbar, and then click in the **Search** bar.
+
+3.	Type _Send an email to &lt;contact_name&gt;_.
+
+ 	Where _&lt;contact_name&gt;_ is the name of someone in your work address book.
+
+4.	Type your email message subject into the **Quick message** (255 characters or less) box and your message into the **Message** (unlimited characters) box, and then click **Send**.
+
+    ![Cortana at work, showing the email text](images/cortana-send-email-coworker.png)    
+ 	 
+## Send an email to a co-worker by using voice commands
+This process helps you to use Cortana at work and voice commands to send a quick message to a co-worker from the work address book.
+
+1.	Click on the **Cortana** icon in the taskbar, and then click the **Microphone** icon (to the right of the **Search** box.
+
+2.	Say _Send an email to &lt;contact_name&gt;_.
+
+ 	Where _&lt;contact_name&gt;_ is the name of someone in your work address book.
+
+3.	Add your email message by saying, _Hello this is a test email using Cortana at work._
+
+ 	The message is added and you’re asked if you want to **Send it**, **Add more**, or **Make changes**.
+
+    ![Cortana at work, showing the email text created from verbal commands](images/cortana-send-email-coworker-mic.png)    
+ 	 
+4.	Say _Send it_.
+
+ 	The email is sent.
+
+    ![Cortana at work, showing the sent email text](images/cortana-complete-send-email-coworker-mic.png)
--- a/windows/manage/cortana-at-work-scenario-6.md
+++ b/windows/manage/cortana-at-work-scenario-6.md
@ -0,0 +1,37 @@
+---
+title: Test scenario 6 - Use Cortana and Windows Information Protection (WIP) to help protect your organization’s data on a device (Windows 10)
+description: An optional test scenario about how to use Cortana at work with Windows Information Protection (WIP).
+ms.prod: w10
+ms.mktglfcycl: manage
+ms.sitesec: library
+localizationpriority: high
+---
+
+# Test scenario 6 - Use Cortana and Windows Information Protection (WIP) to help protect your organization’s data on a device
+
+-   Windows 10, Windows Insider Program 
+-   Windows 10 Mobile, Windows Insider Program
+
+>[!IMPORTANT]
+>Some information relates to prereleased product which may be substantially modified before it's commercially released. Microsoft makes no warranties, express or implied, with respect to the information provided here.
+
+>[!IMPORTANT]
+>The data created as part of these scenarios will be uploaded to Microsoft’s Cloud to help Cortana learn and help your employees. This is the same info that Cortana uses in the consumer offering.
+
+This optional scenario helps you to protect your organization’s data on a device, based on an inspection by Cortana.
+
+## Use Cortana and WIP to protect your organization’s data 
+
+1.	Create and deploy an WIP policy to your organization. For info about how to do this, see [Protect your enterprise data using Windows Information Protection (WIP)](../keep-secure/protect-enterprise-data-using-wip.md).
+
+2.	Create a new email from a non-protected or personal mailbox, including the text _I’ll send you that presentation tomorrow_.
+
+3.	Wait up to 2 hours to make sure everything has updated, click the **Cortana** icon in the taskbar, and then click in the **Search** bar.
+
+    Cortana automatically pulls your commitment to sending the presentation out of your email, showing it to you.
+
+4.	Create a new email from a protected mailbox, including the same text as above, _I’ll send you that presentation tomorrow_.
+
+5.	Wait until everything has updated again, click the **Cortana** icon in the taskbar, and then click in the **Search** bar.
+
+    Because it was in an WIP-protected email, the presentation info isn’t pulled out and it isn’t shown to you.
--- a/windows/manage/cortana-at-work-testing-scenarios.md
+++ b/windows/manage/cortana-at-work-testing-scenarios.md
@ -0,0 +1,32 @@
+---
+title: Testing scenarios using Cortana in your business or organization (Windows 10)
+description: A list of suggested testing scenarios that you can use to test Cortana in your organization.
+ms.prod: w10
+ms.mktglfcycl: manage
+ms.sitesec: library
+localizationpriority: high
+---
+
+# Testing scenarios using Cortana in your business or organization
+**Applies to:**
+
+-   Windows 10, Windows Insider Program 
+-   Windows 10 Mobile, Windows Insider Program
+
+>[!IMPORTANT]
+>Some information relates to prereleased product which may be substantially modified before it's commercially released. Microsoft makes no warranties, express or implied, with respect to the information provided here.
+
+We've come up with a list of suggested testing scenarios that you can use to test Cortana in your organization. After you complete all the scenarios, you should be able to:
+
+- Sign-in to Cortana using Azure AD, manage entries in the notebook, and search for content across your device, Bing, and the cloud, using Cortana.
+
+- Set a reminder and have it remind you when you’ve reached a specific location.
+
+- Search for your upcoming meetings on your work calendar.
+
+- Send an email to a co-worker from your work email app.
+
+- Use WIP to secure content on a device and then try to manage your organization’s entries in the notebook.
+
+>[!IMPORTANT]
+>The data created as part of these scenarios will be uploaded to Microsoft’s Cloud to help Cortana learn and help your employees. This is the same info that Cortana uses in the consumer offering.
--- a/windows/manage/cortana-at-work-voice-commands.md
+++ b/windows/manage/cortana-at-work-voice-commands.md
@ -0,0 +1,64 @@
+---
+title: Set up and test custom voice commands in Cortana for your organization (Windows 10)
+description: How to create voice commands that use Cortana to perform voice-enabled actions in your line-of-business (LOB) Universal Windows Platform (UWP) apps.
+ms.prod: w10
+ms.mktglfcycl: manage
+ms.sitesec: library
+localizationpriority: high
+---
+
+# Set up and test custom voice commands in Cortana for your organization
+**Applies to:**
+
+-   Windows 10, Windows Insider Program 
+-   Windows 10 Mobile, Windows Insider Program
+
+>[!IMPORTANT]
+>Some information relates to prereleased product which may be substantially modified before it's commercially released. Microsoft makes no warranties, express or implied, with respect to the information provided here.
+
+Working with a developer, you can create voice commands that use Cortana to perform voice-enabled actions in your line-of-business (LOB) Universal Windows Platform (UWP) apps. These voice-enabled actions can reduce the time necessary to access your apps and to complete simple actions.
+
+>[!NOTE]
+>For more info about how your developer can extend your current apps to work directly with Cortana, see [Cortana interactions in UWP apps](https://msdn.microsoft.com/en-us/windows/uwp/input-and-devices/cortana-interactions).
+
+## High-level process
+Cortana uses a Voice Command Definition (VCD) file, aimed at an installed app, to define the actions that are to happen during certain vocal commands. A VCD file can be very simple to very complex, supporting anything from a single sound to a collection of more flexible, natural language sounds, all with the same intent.
+
+To enable voice commands in Cortana
+
+1. **Extend your LOB app.** Add a custom VCD file to your app package. This file defines what capabilities are available to Cortana from the app, letting you tell Cortana what vocal commands should be understood and handled by your app and how the app should start when the command is vocalized.
+
+    Cortana can perform actions on apps in the foreground (taking focus from Cortana) or in the background (allowing Cortana to keep focus). We recommend that you decide where an action should happen, based on what your voice command is intended to do. For example, if your voice command requires employee input, it’s best for that to happen in the foreground. However, if the app only uses basic commands and doesn’t require interaction, it can happen in the background.
+
+    - **Start Cortana with focus on your app, using specific voice-enabled statements.** [Create and install a VCD file that starts a foreground app using voice commands and Cortana](https://msdn.microsoft.com/en-us/windows/uwp/input-and-devices/launch-a-foreground-app-with-voice-commands-in-cortana).
+
+    - **Start Cortana removing focus from your app, using specific voice-enabled statements.** [Create and install a VCD file that starts a background app using voice commands and Cortana](https://msdn.microsoft.com/en-us/windows/uwp/input-and-devices/launch-a-background-app-with-voice-commands-in-cortana).
+
+2.	**Install the VCD file on employees' devices**. You can use System Center Configuration Manager or Microsoft Intune to deploy and install the VCD file on your employees' devices, the same way you deploy and install any other package in your organization.
+
+## Test Scenario: Use voice commands in a Windows Store app
+While these aren't line-of-business apps, we've worked to make sure to implement a VCD file, allowing you to test how the functionality works with Cortana in your organization.
+
+**To get a Windows Store app** 
+1.	Go to the Windows Store, scroll down to the **Collections** area, click **Show All**, and then click **Better with Cortana**.
+
+2.	Click **Uber**, and then click **Install**.
+
+3.	Open Uber, create an account or sign in, and then close the app.
+
+**To set up the app with Cortana** 
+1.	Click on the **Cortana** search box in the taskbar, and then click the **Notebook** icon.
+
+2.	Click on **Connected Services**, click **Uber**, and then click **Connect**.
+
+    ![Cortana at work, showing where to connect the Uber service to Cortana](images/cortana-connect-uber.png)
+ 
+**To use the voice-enabled commands with Cortana** 
+1.	Click on the **Cortana** icon in the taskbar, and then click the **Microphone** icon (to the right of the **Search** box).
+
+2.	Say _Uber get me a taxi_.
+
+    Cortana changes, letting you provide your trip details for Uber.
+
+## See also
+- [Cortana for developers](http://go.microsoft.com/fwlink/?LinkId=717385)
--- a/windows/manage/customize-and-export-start-layout.md
+++ b/windows/manage/customize-and-export-start-layout.md
@ -17,9 +17,7 @@ localizationpriority: high

 -   Windows 10

-**Looking for consumer information?**
-
-   [Customize the Start menu](https://go.microsoft.com/fwlink/p/?LinkId=623630)
+>**Looking for consumer information?** See [Customize the Start menu](https://go.microsoft.com/fwlink/p/?LinkId=623630)

 The easiest method for creating a customized Start layout to apply to other Windows 10 devices is to set up the Start screen on a test computer and then export the layout.

@ -29,7 +27,8 @@ When a full Start layout is applied, the users cannot pin, unpin, or uninstall a

 When [a partial Start layout](#configure-a-partial-start-layout) is applied, the contents of the specified tile groups cannot be changed, but users can move those groups, and can also create and customize their own groups.

-**Note**  Partial Start layout is only supported on Windows 10, version 1511 and later.
+>[!NOTE]
+>Partial Start layout is only supported on Windows 10, version 1511 and later.

  

@ -50,7 +49,7 @@ To prepare a Start layout for export, you simply customize the Start layout on a

 1.  Set up a test computer on which to customize the Start layout. Your test computer should have the operating system that is installed on the users’ computers (Windows 10 Enterprise or Windows 10 Education). Install all apps and services that the Start layout should display.

-   2.  Create a new user account that you will use to customize the Start layout.
+2.  Create a new user account that you will use to customize the Start layout.

 <a href="" id="bmk-customize-start"></a>
 **To customize Start**
--- a/windows/manage/customize-windows-10-start-screens-by-using-group-policy.md
+++ b/windows/manage/customize-windows-10-start-screens-by-using-group-policy.md
@ -17,16 +17,14 @@ localizationpriority: high

 -   Windows 10

-**Looking for consumer information?**
-
-   [Customize the Start menu](https://go.microsoft.com/fwlink/p/?LinkId=623630)
+>**Looking for consumer information?** See [Customize the Start menu](https://go.microsoft.com/fwlink/p/?LinkId=623630)

 In Windows 10 Enterprise and Windows 10 Education, you can use a Group Policy Object (GPO) to deploy a customized Start and taskbar layout to users in a domain. No reimaging is required, and the layout can be updated simply by overwriting the .xml file that contains the layout. This enables you to customize Start and taskbar layouts for different departments or organizations, with minimal management overhead.

 This topic describes how to update Group Policy settings to display a customized Start and taskbar layout when the users sign in. By creating a domain-based GPO with these settings, you can deploy a customized Start and taskbar layout to users in a domain.

-**Warning**  
-When a full Start layout is applied with this method, the users cannot pin, unpin, or uninstall apps from Start. Users can view and open all apps in the **All Apps** view, but they cannot pin any apps to Start. When a partial Start layout is applied, the contents of the specified tile groups cannot be changed, but users can move those groups, and can also create and customize their own groups. When you apply a taskbar layout, users will still be able to pin and unpin apps, and change the order of pinned apps.
+>[!WARNING]  
+>When a full Start layout is applied with this method, the users cannot pin, unpin, or uninstall apps from Start. Users can view and open all apps in the **All Apps** view, but they cannot pin any apps to Start. When a partial Start layout is applied, the contents of the specified tile groups cannot be changed, but users can move those groups, and can also create and customize their own groups. When you apply a taskbar layout, users will still be able to pin and unpin apps, and change the order of pinned apps.

  

@ -46,15 +44,15 @@ Three features enable Start and taskbar layout control:

 -   The [Export-StartLayout](https://go.microsoft.com/fwlink/p/?LinkID=620879) cmdlet in Windows PowerShell exports a description of the current Start layout in .xml file format. 

-    **Note**  
-    To import the layout of Start to a mounted Windows image, use the [Import-StartLayout](https://go.microsoft.com/fwlink/p/?LinkId=623707) cmdlet.
+    >[!NOTE]  
+    >To import the layout of Start to a mounted Windows image, use the [Import-StartLayout](https://go.microsoft.com/fwlink/p/?LinkId=623707) cmdlet.

-    [You can modify the Start .xml file](configure-windows-10-taskbar.md) to include  `<CustomTaskbarLayoutCollection>` or create an .xml file just for the taskbar configuration.
+-    [You can modify the Start .xml file](configure-windows-10-taskbar.md) to include  `<CustomTaskbarLayoutCollection>` or create an .xml file just for the taskbar configuration. 

-   In Group Policy, you use the **Start Layout** settings for the **Start Menu and Taskbar** administrative template to set a Start and taskbar layout from an .xml file when the policy is applied.
+-   In Group Policy, you use the **Start Layout** settings for the **Start Menu and Taskbar** administrative template to set a Start and taskbar layout from an .xml file when the policy is applied. The Group Policy object doesn't support an empty tile layout, so the default tile layout for Windows is loaded in that case.

-**Note**  
-To learn how customize Start to include your line-of-business apps when you deploy Windows 10, see [Customize the Windows 10 Start layout]( https://go.microsoft.com/fwlink/p/?LinkId=620863).
+>[!NOTE]  
+>To learn how customize Start to include your line-of-business apps when you deploy Windows 10, see [Customize the Windows 10 Start layout]( https://go.microsoft.com/fwlink/p/?LinkId=620863).

  

@ -76,12 +74,11 @@ For information about deploying GPOs in a domain, see [Working with Group Policy

 You can use the Local Group Policy Editor to provide a customized Start and taskbar layout for any user who signs in on the local computer. To display the customized Start and taskbar layout for any user who signs in, configure **Start Layout** policy settings for the **Start Menu and Taskbar** administrative template. You can use the **Start Menu and Taskbar** administrative template in **User Configuration** or **Computer Configuration**.

-**Note**  
-This procedure applies the policy settings on the local computer only. For information about deploying the Start and taskbar layout to users in a domain, see [Use Group Policy to deploy a customized Start layout in a domain](#bkmk-domaingpodeployment).
+>[!NOTE]  
+>This procedure applies the policy settings on the local computer only. For information about deploying the Start and taskbar layout to users in a domain, see [Use Group Policy to deploy a customized Start layout in a domain](#bkmk-domaingpodeployment).
+>
+>This procedure creates a Local Group Policy that applies to all users on the computer. To configure Local Group Policy that applies to a specific user or group on the computer, see [Step-by-Step Guide to Managing Multiple Local Group Policy Objects](https://go.microsoft.com/fwlink/p/?LinkId=620881). The guide was written for Windows Vista and the procedures still apply to Windows 10.

-This procedure creates a Local Group Policy that applies to all users on the computer. To configure Local Group Policy that applies to a specific user or group on the computer, see [Step-by-Step Guide to Managing Multiple Local Group Policy Objects](https://go.microsoft.com/fwlink/p/?LinkId=620881). The guide was written for Windows Vista and the procedures still apply to Windows 10.
-
- 

 This procedure adds the customized Start and taskbar layout to the user configuration, which overrides any Start layout settings in the local computer configuration when a user signs in on the computer.

@ -107,10 +104,10 @@ This procedure adds the customized Start and taskbar layout to the user configur

    3.  Optionally, enter a comment to identify the Start and taskbar layout.

-    **Important**  
-    If you disable Start Layout policy settings that have been in effect and then re-enable the policy, users will not be able to make changes to Start, however the layout in the .xml file will not be reapplied unless the file has been updated. In Windows PowerShell, you can update the timestamp on a file by running the following command:
+    >[!IMPORTANT]  
+    >If you disable Start Layout policy settings that have been in effect and then re-enable the policy, users will not be able to make changes to Start, however the layout in the .xml file will not be reapplied unless the file has been updated. In Windows PowerShell, you can update the timestamp on a file by running the following command:

-    `(ls <path>).LastWriteTime = Get-Date`
+    >`(ls <path>).LastWriteTime = Get-Date`

     

--- a/windows/manage/customize-windows-10-start-screens-by-using-provisioning-packages-and-icd.md
+++ b/windows/manage/customize-windows-10-start-screens-by-using-provisioning-packages-and-icd.md
@ -58,12 +58,15 @@ When you build a provisioning package, you may include sensitive information in

 3.  Name your project, and click **Next**.

-4.  Choose **Common to all Windows desktop editions** and click **Next**.
+4.  Choose **All Windows desktop editions** and click **Next**.

 5.  On **New project**, click **Finish**. The workspace for your package opens.

 6.  Expand **Runtime settings** &gt; **Start**, and click **StartLayout**.

+    >[!TIP]
+    >If **Start** is not listed, check the type of settings you selected in step 4. You must create the project using settings for **All Windows desktop editions**.
+
 7.  Specify the path and file name of the Start layout .xml that you created with the [Export-StartLayout](https://go.microsoft.com/fwlink/p/?LinkId=620879) cmdlet.

 8.  On the **File** menu, select **Save.**
--- a/windows/manage/images/wufb-config1a.png
+++ b/windows/manage/images/wufb-config1a.png
--- a/windows/manage/images/wufb-config2.png
+++ b/windows/manage/images/wufb-config2.png
--- a/windows/manage/images/wufb-config3a.png
+++ b/windows/manage/images/wufb-config3a.png
--- a/windows/manage/index.md
+++ b/windows/manage/index.md
@ -14,6 +14,9 @@ author: jdeckerMS

 Learn about managing and updating Windows 10.

+>[!NOTE]
+>Information for Windows 10 Enterprise also applies to Windows 10 IoT Enterprise, and information for Windows 10 Mobile Enterprise also applies to Windows 10 IoT Mobile. For information about managing devices running Windows 10 IoT Core, see [Windows 10 IoT Core Commercialization](https://www.windowsforiotdevices.com/).
+
 ## In this section

 <table>
--- a/windows/manage/manage-connections-from-windows-operating-system-components-to-microsoft-services.md
+++ b/windows/manage/manage-connections-from-windows-operating-system-components-to-microsoft-services.md
@ -237,7 +237,8 @@ In Windows 10, version 1507 and Windows 10, version 1511, when you enable the **

    -   For **Remote port**, choose **All ports**.

-If your organization tests network traffic, you should not use Fiddler to test Windows Firewall settings. Fiddler is a network proxy and Windows Firewall does not block proxy traffic. You should use a network traffic analyzer, such as WireShark or Message Analyzer.
+
+If your organization tests network traffic, do not use a network proxy as Windows Firewall does not block proxy traffic. Instead, use a network traffic analyzer. Based on your needs, there are many network traffic analyzers available at no cost.

 ### <a href="" id="bkmk-cortana-mdm"></a>2.2 Cortana and Search MDM policies

--- a/windows/manage/manage-cortana-in-enterprise.md
+++ b/windows/manage/manage-cortana-in-enterprise.md
@ -1,84 +1,5 @@
 ---
 title: Cortana integration in your business or enterprise (Windows 10)
 description: The world’s first personal digital assistant helps users get things done, even at work. Cortana includes powerful configuration options specifically to optimize for unique small to medium-sized business and enterprise environments.
-ms.assetid: db7b05da-186f-4628-806a-f8b134e2af2c
-ms.prod: w10
-ms.mktglfcycl: manage
-ms.sitesec: library
-author: eross-msft
-localizationpriority: high
---
-
-# Cortana integration in your business or enterprise
-**Applies to:**
-
-   Windows 10
-   Windows 10 Mobile
-
->Learn more about what features and functionality are supported in each Windows edition at [Compare Windows 10 Editions](https://www.microsoft.com/en-us/WindowsForBusiness/Compare).
-
-The world’s first personal digital assistant helps users get things done, even at work. Cortana includes powerful configuration options specifically to optimize for unique small to medium-sized business and enterprise environments.
-
-## Cortana integration with Office 365
-Cortana in Windows 10 is already great at letting your employees quickly see what the day is going to look like, see where and when their meetings are going to be, get a sense of travel times to and from work, and even get updates from a calendar for upcoming trips.
-
-But Cortana works even harder when she connects to Office 365, helping employees prepare for meetings, learn about co-workers, and receive reminders about where they need to be so they won’t be late.
-
->**Important**<br>
->Before your employees can use Cortana with Office 365, they must sign into Cortana using a Microsoft account (such as, @outlook.com), and then they must go to the **Connected Accounts** section of Cortana’s notebook to turn on and connect to Office 365.
-
-
-**More info:**
-
-   For specific info about what you need to know as a company administrator, including how to turn off Cortana with Office 365, see the [Cortana integration with Office 365](https://go.microsoft.com/fwlink/p/?LinkId=717378) support topic.
-
-   For a quick review of the frequently asked questions about Cortana and Office 365 integration, see the blog post, [An early look at Cortana integration with Office 365](https://go.microsoft.com/fwlink/p/?LinkId=717379).
-
-## Cortana and Power BI
-Integration between Cortana and Power BI shows how Cortana can work with custom business analytics solutions to enable you to get answers directly from your key business data, including introducing new features that let you create custom Cortana answers using the full capabilities of Power BI Desktop.
-
-**More info:**
-
-   For specific info about how to start using Power BI and Cortana integration, how to customize your data results, and how to use the “Hey Cortana” functionality, see the [Power BI: Announcing Power BI integration with Cortana and new ways to quickly find insights in your data](https://go.microsoft.com/fwlink/p/?LinkId=717382) blog.
-
-## Cortana and Microsoft Dynamics CRM
-Cortana integration is a Preview feature that's available for your test or dev environment, starting with the CRM Online 2016 Update. If you decide to use this Preview feature, you'll need to turn in on and accept the license terms. After that, salespeople will get proactive insights from Cortana on important CRM activities, including sales leads, accounts, and opportunities; presenting the most relevant info at any given time.
-
-**More info:**
-   For more info about Preview features, see [What are Preview features and how do I enable them?](https://go.microsoft.com/fwlink/p/?LinkId=746817).
-   For more info about Cortana, see [What is Cortana?](https://go.microsoft.com/fwlink/p/?LinkId=746818).
-   For more info about CRM integration, how to turn on Cortana, and how to provide feedback, see [Preview feature: Set up Cortana integration](https://go.microsoft.com/fwlink/p/?LinkId=746819).
-
-## Cortana and privacy
-We understand that there are concerns about Cortana and enterprise privacy, so we’ve put together the [Cortana, Search, and privacy: FAQ](https://go.microsoft.com/fwlink/p/?LinkId=717383) topic that covers many of the frequently asked questions. These questions include things such as what info is collected by Cortana, where the info is saved, how to manage what data is collected, how to turn Cortana off, how to opt completely out of data collection, and what info is shared with other Microsoft apps and services.
-
-## Set up Cortana using Group Policy and MDM policies
-Set up and manage Cortana by using the following Group Policy and mobile device management (MDM) policies.
-
-|Group policy |MDM policy |Description |
-|-------------|-----------|------------|
-|Computer Configuration\Administrative Templates\Windows Components\Search\AllowCortanaAboveLock |AboveLock/AllowCortanaAboveLock |Specifies whether an employee can interact with Cortana using voice commands when the system is locked.<p>**Note**<br>This setting only applies to Windows 10 for desktop devices. |
-|Computer Configuration\Administrative Templates\Control Panel\Regional and Language Options\Allow input personalization |Privacy/AllowInputPersonalization |Specifies whether an employee can use voice commands with Cortana in the enterprise.<p>**In Windows 10, version 1511**<br>Cortana won’t work if this setting is turned off (disabled).<p>**In Windows 10, version 1607 and later**<br>Cortana still works if this setting is turned off (disabled). |
-|None |System/AllowLocation |Specifies whether to allow app access to the Location service.<p>**In Windows 10, version 1511**<br>Cortana won’t work if this setting is turned off (disabled).<p>**In Windows 10, version 1607 and later**<br>Cortana still works if this setting is turned off (disabled). |
-|None |Accounts/AllowMicrosoftAccountConnection |Specifies whether to allow employees to sign in using a Microsoft account (MSA) from Windows apps. |
-|Computer Configuration\Administrative Templates\Windows Components\Search\Allow search and Cortana to use location |Search/AllowSearchToUseLocation |Specifies whether Cortana can use your current location during searches and for location reminders. |
-|Computer Configuration\Administrative Templates\Windows Components\Search\Set the SafeSearch setting for Search |Search/SafeSearchPermissions |Specifies what level of safe search (filtering adult content) is required.<p>**Note**<br>This setting only applies to Windows 10 Mobile. |
-|User Configuration\Administrative Templates\Windows Components\File Explorer\Turn off display of recent search entries in the File Explorer search box |None |Specifies whether the search box can suggest recent queries and prevent entries from being stored in the registry for future reference. |
-|Computer Configuration\Administrative Templates\Windows Components\Search\Don't search the web or display web results |None |Specifies whether search can perform queries on the web and if the web results are displayed in search.<p>**In Windows 10 Pro edition**<br>This setting can’t be managed.<p>**In Windows 10 Enterprise edition**<br>Cortana won't work if this setting is turned off (disabled). |
-|Computer Configuration\Administrative Templates\Windows Components\Search\Allow Cortana |Experience/AllowCortana |Specifies whether employees can use Cortana.<p>**Important**<br>Cortana won’t work if this setting is turned off (disabled). However, employees can still perform local searches even with Cortana turned off. |
-
-**More info:**
-   For specific info about how to set, manage, and use each of these MDM policies to configure Cortana in your enterprise, see the [Policy CSP](https://go.microsoft.com/fwlink/p/?LinkId=717380) topic, located in the configuration service provider reference topics. For specific info about how to set, manage, and use each of these Group Policies to configure Cortana in your enterprise, see the [Group Policy TechCenter](https://go.microsoft.com/fwlink/p/?LinkId=717381).
-
-## Related topics
- [Cortana and Windows](https://go.microsoft.com/fwlink/p/?LinkId=717384)
- [Cortana for developers](https://go.microsoft.com/fwlink/p/?LinkId=717385)
-
- 
-
- 
-
-
-
-
-
+redirect_url: https://technet.microsoft.com/en-us/itpro/windows/manage/cortana-at-work-overview
+---
--- a/windows/manage/manage-windows-10-in-your-organization-modern-management.md
+++ b/windows/manage/manage-windows-10-in-your-organization-modern-management.md
@ -18,6 +18,10 @@ Your organization might have considered bringing in Windows 10 devices and downg

 Your organization can support various operating systems across a wide range of device types, and manage them through a common set of tools such as System Center Configuration Manager, Microsoft Intune, or other third-party products. This “managed diversity” enables you to empower your users to benefit from the productivity enhancements available on their new Windows 10 devices (including rich touch and ink support), while still maintaining your standards for security and manageability. It can help you and your organization benefit from Windows 10 much faster.

+This six-minute video demonstrates how users can bring in a new retail device and be up and working with their personalized settings and a managed experience in a few minutes, without being on the corporate network. It also demonstrates how IT can apply policies and configurations to ensure device compliance.
+
+ <iframe width="560" height="315" src="https://www.youtube.com/embed/g1rIcBhhxpA" frameborder="0" allowfullscreen></iframe> 
+
 This topic offers guidance on strategies for deploying and managing Windows 10, including deploying Windows 10 in a mixed environment. The topic covers [management options](#reviewing-the-management-options-with-windows-10) plus the four stages of the device lifecycle:

 -   [Deployment and Provisioning](#deployment-and-provisioning)
--- a/windows/manage/start-layout-xml-desktop.md
+++ b/windows/manage/start-layout-xml-desktop.md
@ -0,0 +1,492 @@
+---
+title: Start layout XML for desktop editions of Windows 10 (Windows 10)
+description: This topic describes the options for customizing Start layout in LayoutModification.xml for Windows 10 desktop editions.
+keywords: ["start screen"]
+ms.prod: w10
+ms.mktglfcycl: manage
+ms.sitesec: library
+author: jdeckerMS
+localizationpriority: high
+---
+
+# Start layout XML for desktop editions of Windows 10 (reference)
+
+
+**Applies to**
+
+-   Windows 10
+
+>**Looking for consumer information?** See [Customize the Start menu](https://go.microsoft.com/fwlink/p/?LinkId=623630)
+
+On Windows 10 for desktop editions, the customized Start works by:
+
+- Windows 10 checks the chosen base default layout, such as the desktop edition and whether Cortana is supported for the country/region.
+
+- Windows 10 reads the LayoutModification.xml file and allows groups to be appended to Start. The groups have the following constraints:
+    - 2 groups that are 6 columns wide, or equivalent to the width of 3 medium tiles.
+    - 2 medium-sized tile rows in height. Windows 10 ignores any tiles that are pinned beyond the second row. 
+    - No limit to the number of apps that can be pinned. There is a theoretical limit of 24 tiles per group (4 small tiles per medium square x 3 columns x 2 rows). 
+
+## LayoutModification XML
+
+IT admins can provision the Start layout using a LayoutModification.xml file. This file supports several mechanisms to modify or replace the default Start layout and its tiles. The easiest method for creating a LayoutModification.xml file is by using the Export-StartLayout cmdlet; see [Customize and export Start layout](customize-and-export-start-layout.md) for instructions.
+
+>[!NOTE]  
+>To make sure the Start layout XML parser processes your file correctly, follow these guidelines when working with your LayoutModification.xml file:
+>- Do not leave spaces or white lines in between each element.
+>- Do not add comments inside the StartLayout node or any of its children elements.
+>- Do not add multiple rows of comments.
+
+The following table lists the supported elements and attributes for the LayoutModification.xml file.
+
+| Element | Attributes | Description |
+| --- | --- | --- |
+| LayoutModificationTemplate | xmlns</br>xmlns:defaultlayout</br>xmlns:start</br>Version | Use to describe the changes to the default Start layout |
+| [LayoutOptions](#layoutoptions)</br></br>Parent:</br>LayoutModificationTemplate | StartTileGroupsColumnCount</br>FullScreenStart | Use to specify:</br>- Whether to use full screen Start on the desktop</br>- The number of tile columns in the Start menu |
+| RequiredStartGroupsCollection</br></br>Parent:</br>LayoutModificationTemplate | n/a | Use to contain collection of RequiredStartGroups |
+| [RequiredStartGroups](#requiredstartgroups)</br></br>Parent:</br>RequiredStartGroupsCollection | Region | Use to contain the AppendGroup tags, which represent groups that can be appended to the default Start layout |
+| [AppendGroup](#appendgroup)</br></br>Parent:</br>RequiredStartGroups | Name | Use to specify the tiles that need to be appended to the default Start layout |
+| [start:Tile](#specify-start-tiles)</br></br>Parent:</br>AppendGroup | AppUserModelID</br>Size</br>Row</br>Column | Use to specify any of the following:</br>- A Universal Windows app</br>- A Windows 8 or Windows 8.1 app |
+| start:DesktopApplicationTile</br></br>Parent:</br>AppendGroup | DesktopApplicationID</br>DesktopApplicationLinkPath</br>Size</br>Row</br>Column | Use to specify any of the following:</br>- A Windows desktop application with a known AppUserModelID</br>- An application in a known folder with a link in a legacy Start Menu folder</br>- A Windows desktop application link in a legacy Start Menu folder</br>- A Web link tile with an associated .url file that is in a legacy Start Menu folder |
+| start:SecondaryTile</br></br>Parent:</br>AppendGroup | AppUserModelID</br>TileID</br>Arguments</br>DisplayName</br>Square150x150LogoUri</br>ShowNameOnSquare150x150Logo</br>ShowNameOnWide310x150Logo</br>Wide310x150LogoUri</br>BackgroundColor</br>ForegroundText</br>IsSuggestedApp</br>Size</br>Row</br>Column | Use to pin a Web link through a Microsoft Edge secondary tile |
+| TopMFUApps</br></br>Parent:</br>LayoutModificationTemplate | n/a | Use to add up to 3 default apps to the frequently used apps section in the system area |
+| Tile</br></br>Parent:</br>TopMFUApps | AppUserModelID | Use with the TopMFUApps tags to specify an app with a known AppUserModelID |
+| DesktopApplicationTile</br></br>Parent:</br>TopMFUApps | LinkFilePath | Use with the TopMFUApps tags to specify an app without a known AppUserModelID |
+| AppendOfficeSuite</br></br>Parent:</br>LayoutModificationTemplate | n/a | Use to add the in-box installed Office suite to Start</br></br>Do not use this tag with AppendDownloadOfficeTile |
+| AppendDownloadOfficeTile</br></br>Parent:</br>LayoutModificationTemplate | n/a | Use to add a specific **Download Office** tile to a specific location in Start</br></br>Do not use this tag with AppendOfficeSuite |
+
+### LayoutOptions
+
+New devices running Windows 10 for desktop editions will default to a Start menu with 2 columns of tiles unless boot to tablet mode is enabled. Devices with screens that are under 10" have boot to tablet mode enabled by default. For these devices, users see the full screen Start on the desktop. You can adjust the following features:
+
+- Boot to tablet mode can be set on or off. 
+- Set full screen Start on desktop to on or off. 
+    To do this, add the LayoutOptions element in your LayoutModification.xml file and set the FullScreenStart attribute to true or false. 
+- Specify the number of columns in the Start menu to 1 or 2. 
+    To do this, add the LayoutOptions element in your LayoutModification.xml file and set the StartTileGroupsColumnCount attribute to 1 or 2. 
+
+The following example shows how to use the LayoutOptions element to specify full screen Start on the desktop and to use 1 column in the Start menu:
+
+```XML
+<LayoutModificationTemplate
+    xmlns="http://schemas.microsoft.com/Start/2014/LayoutModification"
+    xmlns:defaultlayout="http://schemas.microsoft.com/Start/2014/FullDefaultLayout"
+    xmlns:start="http://schemas.microsoft.com/Start/2014/StartLayout"
+    Version="1">
+    <LayoutOptions
+        StartTileGroupsColumnCount="1"
+        FullScreenStart="true"
+    />
+</LayoutModificationTemplate>
+```
+
+For devices being upgraded to Windows 10 for desktop editions:
+
+- Devices being upgraded from Windows 7 will default to a Start menu with 1 column.
+- Devices being upgraded from Windows 8.1 or Windows 8.1 Upgrade will default to a Start menu with 2 columns.
+
+### RequiredStartGroups
+
+The **RequiredStartGroups** tag contains **AppendGroup** tags that represent groups that you can append to the default Start layout. 
+
+>[!IMPORTANT]
+>For Windows 10 for desktop editions, you can add a maximum of two (2) **AppendGroup** tags per **RequiredStartGroups** tag. 
+
+You can also assign regions to the append groups in the **RequiredStartGroups** tag's using the optional **Region** attribute or you can use the multivariant capabilities in Windows provisioning. If you are using the **Region** attribute, you must use a two-letter country code to specify the country/region that the append group(s) apply to. To specify more than one country/region, use a pipe ("|") delimiter as shown in the following example: 
+
+```XML
+<RequiredStartGroups
+      Region="DE|ES|FR|GB|IT|US">
+```
+
+If the country/region setting for the Windows device matches a **RequiredStartGroups**, then the tiles laid out within the **RequiredStartGroups** is applied to Start. 
+
+If you specify a region-agnostic **RequiredStartGroups** (or one without the optional Region attribute) then the region-agnostic **RequiredStartGroups** is applied to Start.
+
+### AppendGroup
+
+**AppendGroup** tags specify a group of tiles that will be appended to Start. There is a maximum of two **AppendGroup** tags allowed per **RequiredStartGroups** tag. 
+
+For Windows 10 for desktop editions, AppendGroup tags contain start:Tile, start:DesktopApplicationTile, or start:SecondaryTile tags. 
+
+You can specify any number of tiles in an **AppendGroup**, but you cannot specify a tile with a **Row** attribute greater than 4. The Start layout does not support overlapping tiles. 
+
+### Specify Start tiles
+
+To pin tiles to Start, partners must use the right kind of tile depending on what you want to pin. 
+
+#### Tile size and coordinates
+
+All tile types require a size (**Size**) and coordinates (**Row** and **Column**) attributes regardless of the tile type that you use when prepinning items to Start.
+
+The following table describes the attributes that you must use to specify the size and location for the tile.
+
+| Attribute | Description |
+| --- | --- |
+| Size | Determines how large the tile will be.</br></br>- 1x1 - small tile</br>- 2x2 - medium tile</br>- 4x2 - wide tile</br>- 4x4 - large tile |
+| Row | Specifies the row where the tile will appear. |
+| Column | Specifies the column where the tile will appear. |
+
+For example, a tile with Size="2x2", Row="2", and Column="2" results in a tile located at (2,2) where (0,0) is the top-left corner of a group.
+
+#### start:Tile
+
+You can use the **start:Tile** tag to pin any of the following apps to Start:
+
+- A Universal Windows app
+- A Windows 8 app or Windows 8.1 app 
+
+To specify any one of these apps, you must set the **AppUserModelID** attribute to the application user model ID that's associated with the corresponding app. 
+
+The following example shows how to pin the Microsoft Edge Universal Windows app:
+
+ ```XML
+ <start:Tile
+          AppUserModelID="Microsoft.MicrosoftEdge_8wekyb3d8bbwe!MicrosoftEdge"
+          Size="2x2"
+          Row="0"
+          Column="0"/>
+ ```
+
+#### start:DesktopApplicationTile
+
+You can use the **start:DesktopApplicationTile** tag to pin a Windows desktop application to Start. There are two ways you can specify a Windows desktop application: 
+
+- By using a path to a shortcut link (.lnk file) to a Windows desktop application.
+
+    To pin a Windows desktop application through this method, you must first add the .lnk file in the specified location when the device first boots. 
+
+    The following example shows how to pin the Command Prompt:
+
+    ```XML
+    <start:DesktopApplicationTile
+          DesktopApplicationLinkPath="%appdata%\Microsoft\Windows\Start Menu\Programs\System Tools\Command Prompt.lnk"
+          Size="2x2"
+          Row="0"
+          Column="4"/>
+    ```
+    
+    You must set the **DesktopApplicationLinkPath** attribute to the .lnk file that points to the Windows desktop application. The path also supports environment variables.
+
+    If you are pointing to a third-party Windows desktop application, you must put the .lnk file in a legacy Start Menu directory before first boot; for example, "%APPDATA%\Microsoft\Windows\Start Menu\Programs\" or the all users profile "%ALLUSERSPROFILE%\Microsoft\Windows\Start Menu\Programs\".
+
+- By using the application's application user model ID, if this is known. If the Windows desktop application doesn't have one, use the shortcut link option.
+
+    To pin a Windows desktop application through this method, you must set the **DesktopApplicationID** attribute to the application user model ID that's associated with the corresponding app. 
+
+    The following example shows how to pin the Internet Explorer Windows desktop application:
+
+    ```XML
+    <start:DesktopApplicationTile
+          DesktopApplicationID="Microsoft.Windows.Explorer"
+          Size="2x2"
+          Row="0"
+          Column="2"/>
+    ```
+    
+
+You can also use the **start:DesktopApplicationTile** tag as one of the methods for pinning a Web link to Start. The other method is to use a Microsoft Edge secondary tile.
+
+To pin a legacy .url shortcut to Start, you must create .url file (right-click on the desktop, select **New** > **Shortcut**, and then type a Web URL). You must add this .url file in a legacy Start Menu directory before first boot; for example, `%APPDATA%\Microsoft\Windows\Start Menu\Programs\` or the all users profile `%ALLUSERSPROFILE%\Microsoft\Windows\Start Menu\Programs\`.
+
+The following example shows how to create a tile of the Web site's URL, which you can treat similarly to a Windows desktop application tile:
+
+```XML
+<start:DesktopApplicationTile
+          DesktopApplicationID="http://www.contoso.com/"
+          Size="2x2"
+          Row="0"
+          Column="2"/>
+```
+
+#### start:SecondaryTile
+
+You can use the **start:SecondaryTile** tag to pin a Web link through a Microsoft Edge secondary tile. This method doesn't require any additional action compared to the method of using legacy .url shortcuts (through the start:DesktopApplicationTile tag).
+
+The following example shows how to create a tile of the Web site's URL using the Microsoft Edge secondary tile:
+
+```XML
+<start:SecondaryTile
+          AppUserModelID="Microsoft.MicrosoftEdge_8wekyb3d8bbwe!MicrosoftEdge"
+          TileID="MyWeblinkTile"
+          Arguments="http://msn.com"
+          DisplayName="MySite"
+          Square150x150LogoUri="ms-appx:///Assets/MicrosoftEdgeSquare150x150.png" 
+          Wide310x150LogoUri="ms-appx:///Assets/MicrosoftEdgeWide310x150.png"
+          ShowNameOnSquare150x150Logo="true"
+          ShowNameOnWide310x150Logo="false"
+          BackgroundColor="#FF112233"
+          Size="2x2"
+          Row="0"
+          Column="4"/>
+```
+
+The following table describes the other attributes that you can use with the **start:SecondaryTile** tag in addition to *8Size**, **Row**, and *8Column**.
+
+| Attribute | Required/optional | Description |
+| --- | --- | --- |
+| AppUserModelID | Required | Must point to Microsoft Edge. |
+| TileID | Required | Must uniquely identify your Web site tile. |
+| Arguments | Required | Must contain the URL of your Web site. |
+| DisplayName | Required | Must specify the text that you want users to see. |
+| Square150x150LogoUri | Required | Specifies the logo to use on the 2x2 tile. |
+| Wide310x150LogoUri | Optional | Specifies the logo to use on the 4x2 tile. |
+| ShowNameOnSquare150x150Logo | Optional | Specifies whether the display name is shown on the 2x2 tile. The values you can use for this attribute are true or false. |
+| ShowNameOnWide310x150Logo | Optional | Specifies whether the display name is shown on the 4x2 tile. The values you can use for this attribute are true or false. |
+| BackgroundColor | Optional | Specifies the color of the tile. You can specify the value in ARGB hexadecimal (for example, #FF112233) or specify "transparent". |
+| ForegroundText | Optional | Specifies the color of the foreground text. Set the value to either "light" or "dark". |
+
+Secondary Microsoft Edge tiles have the same size and location behavior as a Universal Windows app, Windows 8 app, or Windows 8.1 app.
+
+#### TopMFUApps
+
+You can use the **TopMFUApps** tag to add up to 3 default apps to the frequently used apps section in the system area, which delivers system-driven lists to the user including important or frequently accessed system locations and recently installed apps. 
+
+You can use this tag to add:
+
+- Apps with an **AppUserModelID** attribute - This includes Windows desktop applications that have a known application user model ID. Use a **Tile** tag with the **AppUserModelID** attribute set to the app's application user model ID.
+- Apps without a **AppUserModelID** attribute - For these apps, you must create a .lnk file that points to the installed app and place the .lnk file in the `%ALLUSERSPROFILE%\Microsoft\Windows\Start Menu\Programs` directory. Use a **DesktopApplicationTile** tag with the **LinkFilePath** attribute set to the .lnk file name and path.
+
+The following example shows how to modify your LayoutModification.xml file to add both kinds of apps to the system area in Start:
+
+ ```XML
+ <LayoutModificationTemplate
+    xmlns="http://schemas.microsoft.com/Start/2014/LayoutModification"
+    xmlns:defaultlayout="http://schemas.microsoft.com/Start/2014/FullDefaultLayout"
+    xmlns:start="http://schemas.microsoft.com/Start/2014/StartLayout"
+    Version="1">
+    <TopMFUApps>
+        <Tile AppUserModelID="Microsoft.WindowsCalculator_8wekyb3d8bbwe!App" />
+        <Tile AppUserModelID="Microsoft.Getstarted_8wekyb3d8bbwe!App" />
+        <DesktopApplicationTile LinkFilePath="%ALLUSERSPROFILE%\Microsoft\Windows\Start Menu\Programs\Win32App.lnk" />
+  </TopMFUApps>
+</LayoutModificationTemplate>
+```
+
+#### AppendOfficeSuite
+
+You can use the **AppendOfficeSuite** tag to add the in-box installed Office suite of apps to Start.
+
+The following example shows how to add the **AppendOfficeSuite** tag to your LayoutModification.xml file to append the full Universal Office suite to Start:
+
+```XML
+<LayoutModificationTemplate
+    xmlns="http://schemas.microsoft.com/Start/2014/LayoutModification"
+    xmlns:defaultlayout="http://schemas.microsoft.com/Start/2014/FullDefaultLayout"
+    xmlns:start="http://schemas.microsoft.com/Start/2014/StartLayout"
+    Version="1">
+    <AppendOfficeSuite/>
+</LayoutModificationTemplate>
+```
+
+#### AppendDownloadOfficeTile
+
+You can use the **AppendDownloadOfficeTile** tag to append the Office trial installer to Start. This tag adds the Download Office tile to Start and the download tile will appear at the bottom right-hand side of the second group.
+
+The following example shows how to add the **AppendDownloadOfficeTile** tag to your LayoutModification.xml file:
+
+```XML
+<LayoutModificationTemplate
+    xmlns="http://schemas.microsoft.com/Start/2014/LayoutModification"
+    xmlns:defaultlayout="http://schemas.microsoft.com/Start/2014/FullDefaultLayout"
+    xmlns:start="http://schemas.microsoft.com/Start/2014/StartLayout"
+    Version="1">
+    <AppendDownloadOfficeTile/>
+</LayoutModificationTemplate>
+```
+
+## Sample LayoutModification.xml
+
+The following sample LayoutModification.xml shows how you can configure the Start layout for devices running Windows 10 for desktop editions:
+
+```XML
+<LayoutModificationTemplate
+    xmlns="http://schemas.microsoft.com/Start/2014/LayoutModification"
+    xmlns:defaultlayout="http://schemas.microsoft.com/Start/2014/FullDefaultLayout"
+    xmlns:start="http://schemas.microsoft.com/Start/2014/StartLayout"
+    Version="1">
+  <RequiredStartGroupsCollection>
+    <RequiredStartGroups
+      Region="DE|ES|FR|GB|IT|US">
+	  <AppendGroup
+        Name="Fabrikam Group 1">
+        <start:Tile
+          AppUserModelID="Microsoft.Office.Word_8wekyb3d8bbwe!microsoft.word"
+          Size="2x2"
+          Row="0"
+          Column="0"/>
+        <start:DesktopApplicationTile
+          DesktopApplicationID="Microsoft.Windows.Explorer"
+          Size="2x2"
+          Row="0"
+          Column="2"/>
+        <start:Tile
+          AppUserModelID="Microsoft.Office.Excel_8wekyb3d8bbwe!microsoft.excel"
+          Size="2x2"
+          Row="0"
+          Column="4"/>
+      </AppendGroup>	  
+      <AppendGroup
+        Name="Fabrikam Group 2">
+        <start:Tile
+          AppUserModelID="Microsoft.Reader_8wekyb3d8bbwe!Microsoft.Reader"
+          Size="2x2"
+          Row="0"
+          Column="0"/>
+        <start:DesktopApplicationTile
+          DesktopApplicationID="http://www.bing.com/"
+          Size="2x2"
+          Row="0"
+          Column="2"/>
+        <start:DesktopApplicationTile
+          DesktopApplicationLinkPath="%ALLUSERSPROFILE%\Microsoft\Windows\Start Menu\Programs\Accessories\Paint.lnk"
+          Size="2x2"
+          Row="0"
+          Column="4"/>
+      </AppendGroup>
+    </RequiredStartGroups>
+    <RequiredStartGroups>
+      <AppendGroup
+        Name="Fabrikam Group 1">
+        <start:Tile
+          AppUserModelID="Microsoft.Office.Word_8wekyb3d8bbwe!microsoft.word"
+          Size="2x2"
+          Row="0"
+          Column="0"/>
+		<start:SecondaryTile
+          AppUserModelID="Microsoft.MicrosoftEdge_8wekyb3d8bbwe!MicrosoftEdge"
+          TileID="FabrikamWeblinkTile"
+          Arguments="http://www.fabrikam.com"
+          DisplayName="Fabrikam"
+          Square150x150LogoUri="ms-appx:///Assets/MicrosoftEdgeSquare150x150.png"
+          ShowNameOnSquare150x150Logo="true"
+		  BackgroundColor="#FF112233"
+		  Size="2x2"
+          Row="0"
+          Column="2"/>
+      </AppendGroup>	  
+    </RequiredStartGroups>
+  </RequiredStartGroupsCollection> 
+  <TopMFUApps>
+    <Tile AppUserModelID="Microsoft.WindowsCalculator_8wekyb3d8bbwe!App" />
+  </TopMFUApps>  
+</LayoutModificationTemplate>
+```
+
+## Use Windows Provisioning multivariant support
+
+The Windows Provisioning multivariant capability allows you to declare target conditions that, when met, supply specific customizations for each variant condition. For Start customization, you can create specific layouts for each variant that you have. To do this, you must create a separate LayoutModification.xml file for each variant that you want to support and then include these in your provisioning package. For more information on how to do this, see [Create a provisioning package with multivariant settings](https://msdn.microsoft.com/library/windows/hardware/dn916108.aspx).
+
+The provisioning engine chooses the right customization file based on the target conditions that were met, adds the file in the location that's specified for the setting, and then uses the specific file to customize Start. To differentiate between layouts, you can add modifiers to the LayoutModification.xml filename such as "LayoutCustomization1". Regardless of the modifier that you use, the provsioning engine will always output "LayoutCustomization.xml" so that the operating system has a consistent file name to query against.
+
+For example, if you want to ensure that there's a specific layout for a certain condition, you can:
+1. Create a specific layout customization file and then name it LayoutCustomization1.xml.
+2. Include the file as part of your provisioning package.
+3. Create your multivariant target and reference the XML file within the target condition in the main customization XML file.
+
+The following example shows what the overall customization file might look like with multivariant support for Start:
+
+```XML
+<?xml version="1.0" encoding="utf-8"?>
+<WindowsCustomizatons>
+  <PackageConfig xmlns="urn:schemas-Microsoft-com:Windows-ICD-Package-Config.v1.0">
+    <ID>{6aaa4dfa-00d7-4aaa-8adf-73c6a7e2501e}</ID>
+    <Name>My Provisioning Package</Name>
+    <Version>1.0</Version>
+    <OwnerType>OEM</OwnerType>
+    <Rank>50</Rank>
+  </PackageConfig>
+  <Settings xmlns="urn:schemas-microsoft-com:windows-provisioning">
+    <Customizations>
+      <Targets>
+        <Target Id="Processor ABC">
+          <TargetState>
+          <TargetState> 
+            <Condition Name="ProcessorName" Value="Pattern:.*Celeron.*" /> 
+            <Condition Name="ProcessorType" Value="Pattern:.*I|intel.*" /> 
+          </TargetState>
+          </TargetState>
+        </Target>
+      </Targets>
+      <Common>
+        <Settings> 
+          <Policies> 
+            <AllowBrowser>1</AllowBrowser> 
+            <AllowCamera>1</AllowCamera> 
+            <AllowBluetooth>1</AllowBluetooth> 
+          </Policies> 
+          <HotSpot> 
+            <Enabled>1</Enabled> 
+          </HotSpot> 
+        </Settings> 
+      </Common>
+      <Variant>
+        <TargetRefs>
+          <TargetRef Id="Processor ABC" />
+        </TargetRefs>
+        <Settings>
+          <StartLayout>c:\users\<userprofile>\appdata\local\Microsoft\Windows\Shell\LayoutCustomization1.XML</StartLayout>
+          <HotSpot>
+            <Enabled>1</Enabled>
+          </HotSpot>
+        </Settings>
+      </Variant>
+    </Customizations>
+  </Settings>
+</WindowsCustomizatons>
+```
+
+When the condition is met, the provisioning engine takes the XML file and places it in the location that the operating system has set and then the Start subsystem reads the file and applies the specific customized layout.
+
+You must repeat this process for all variants that you want to support so that each variant can have a distinct layout for each of the conditions and targets that need to be supported. For example, if you add a **Language** condition, you can create a Start layout that has its own localized group.
+
+## Add the LayoutModification.xml file to the device
+
+Once you have created your LayoutModification.xml file to customize devices that will run Windows 10 for desktop editions, you can use Windows ICD methods to add the XML file to the device. 
+
+1. In the **Available customizations** pane, expand **Runtime settings**, select **Start** and then click the **StartLayout** setting.
+2. In the middle pane, click **Browse** to open File Explorer.
+3. In the File Explorer window, navigate to the location where you saved your LayoutModification.xml file. 
+4. Select the file and then click **Open**. 
+
+This should set the value of **StartLayout**. The setting appears in the **Selected customizations** pane.
+
+>[!NOTE]
+>There is currently no way to add the .url and .lnk files through Windows ICD. 
+
+Once you have created the LayoutModification.xml file and it is present in the device, the system overrides the base default layout and any Unattend settings used to customize Start. 
+
+
+
+
+
+
+
+
+
+
+
+
+## Related topics
+
+
+[Manage Windows 10 Start layout options](windows-10-start-layout-options-and-policies.md)
+
+[Configure Windows 10 taskbar](configure-windows-10-taskbar.md)
+
+[Customize Windows 10 Start and taskbar with Group Policy](customize-windows-10-start-screens-by-using-group-policy.md)
+
+[Customize Windows 10 Start and taskbar with ICD and provisioning packages](customize-windows-10-start-screens-by-using-provisioning-packages-and-icd.md)
+
+[Customize Windows 10 Start with mobile device management (MDM)](customize-windows-10-start-screens-by-using-mobile-device-management.md)
+
+[Changes to Group Policy settings for Windows 10 Start](changes-to-start-policies-in-windows-10.md)
+
+ 
+
+ 
+
+
+
+
+
--- a/windows/manage/start-layout-xml-mobile.md
+++ b/windows/manage/start-layout-xml-mobile.md
@ -0,0 +1,392 @@
+---
+title: Start layout XML for mobile editions of Windows 10 (Windows 10)
+description: This topic describes the options for customizing Start layout in LayoutModification.xml for Windows 10 mobile editions.
+keywords: ["start screen"]
+ms.prod: w10
+ms.mktglfcycl: manage
+ms.sitesec: library
+author: jdeckerMS
+localizationpriority: high
+---
+
+# Start layout XML for mobile editions of Windows 10 (reference)
+
+
+**Applies to**
+
+-   Windows 10
+
+>**Looking for consumer information?** See [Customize the Start menu](https://go.microsoft.com/fwlink/p/?LinkId=623630)
+
+
+On Windows 10 Mobile, you can use the XML-based layout to modify the Start screen and provide the most robust and complete Start customization experience. 
+
+On Windows 10 Mobile, the customized Start works by:
+
+- Windows 10 performs checks to determine the correct base default layout. The checks include the mobile edition, whether the device is dual SIM, the column width, and whether Cortana is supported for the country/region.
+- Windows 10 ensures that it does not overwrite the layout that you have set and will sequence the level checks and read the file layout such that any multivariant settings that you have set is not overwritten.
+- Windows 10 reads the LayoutModification.xml file and appends the group to the Start screen. 
+
+## Default Start layouts
+
+The following diagrams show the default Windows 10, version 1607 Start layouts for single SIM and dual SIM devices with Cortana support, and single SIM and dual SIM devices with no Cortana support. 
+
+![Start layout for Windows 10 Mobile](images\mobile-start-layout.png)
+
+The diagrams show:
+
+- Tile coordinates - These are determined by the row number and the column number.
+- Fold - Tiles "above the fold" are visible when users first navigate to the Start screen. Tiles "below the fold" are visible after users scroll up.
+- Partner-customizable tiles - OEM and mobile operator partners can customize these areas of the Start screen by prepinning content. The partner configurable slots are:
+    - Rows 6-9
+    - Rows 16-19
+
+## LayoutModification XML
+
+IT admins can provision the Start layout by creating a LayoutModification.xml file. This file supports several mechanisms to modify or replace the default Start layout and its tiles.
+
+>[!NOTE]  
+>To make sure the Start layout XML parser processes your file correctly, follow these guidelines when writing your LayoutModification.xml file:
+>- Do not leave spaces or white lines in between each element.
+>- Do not add comments inside the StartLayout node or any of its children elements.
+>- Do not add multiple rows of comments.
+
+The following table lists the supported elements and attributes for the LayoutModification.xml file.
+
+| Element | Attributes | Description |
+| --- | --- | --- |
+| LayoutModificationTemplate | xmlns</br>xmlns:defaultlayout</br>xmlns:start</br>Version | Use to describe the changes to the default Start layout. |
+| DefaultLayoutOverride</br></br>Parent:</br>LayoutModificationTemplate | n/a | Use to specify the customized Start layout for mobile devices. |
+| StartLayoutCollection</br></br>Parent:</br>DefaultLayoutOverride | n/a | Use to contain a collection of Start layouts. |
+| StartLayout</br></br>Parent:</br>StartLayoutCollection | n/a | Use to specify the tile groups that will be appended to the Start screen. |
+| start:Group</br></br>Parent:</br>StartLayout | Name | Use to specify the tiles that need to be appended to the default Start layout. | 
+| start:Tile</br></br>Parent:</br>start:Group | AppUserModelID</br>Size</br>Row</br>Column | Use to specify any Universal Windows app that has a valid **AppUserModelID** attribute. |
+| start:SecondaryTile</br></br>Parent:</br>start:Group | AppUserModelID</br>TileID</br>Arguments</br>DisplayName</br>Square150x150LogoUri</br>ShowNameOnSquare150x150Logo</br>ShowNameOnWide310x150Logo</br>Wide310x150LogoUri</br>BackgroundColor</br>ForegroundText</br>IsSuggestedApp</br>Size</br>Row</br>Column | Use to pin a Web link through a Microsoft Edge secondary tile. |
+| start:PhoneLegacyTile</br></br>Parent:</br>start:Group | ProductID</br>Size</br>Row</br>Column | Use to add a mobile app that has a valid **ProductID** attribute. |
+| start:Folder</br></br>Parent:</br>start:Group | Name</br>Size</br>Row</br>Column | Use to add a folder to the mobile device's Start screen. |
+| RequiredStartTiles</br></br>Parent:</br>LayoutModificationTemplate | n/a | Use to specify the tiles that will be pinned to the bottom of the Start screen even if a restored Start screen does not have the tiles during backup or restore. |
+
+### start:Group
+ 
+**start:Group** tags specify a group of tiles that will be appended to Start. You can set the **Name** attribute to specify a name for the Start group.
+
+>[!NOTE]
+>Windows 10 Mobile only supports one Start group.
+
+ For Windows 10 Mobile, **start:Group** tags can contain the following tags or elements:
+
+- **start:Tile**
+- **start:SecondaryTile**
+- **start:PhoneLegacyTile**
+- **start:Folder**
+
+### Specify Start tiles
+
+To pin tiles to Start, you must use the right kind of tile depending on what you want to pin. 
+
+#### Tile size and coordinates
+
+All tile types require a size (**Size**) and coordinates (**Row** and **Column**) attributes regardless of the tile type that you use when prepinning items to Start.
+
+The following table describes the attributes that you must use to specify the size and location for the tile.
+
+| Attribute | Description |
+| --- | --- |
+| Size | Determines how large the tile will be. </br>- 1x1 - small tile</br>- 2x2 - medium tile</br>- 4x2 - wide tile</br>- 4x4 - large tile |
+| Row | Specifies the row where the tile will appear. |
+| Column | Specifies the column where the tile will appear. |
+ 
+For example, a tile with Size="2x2", Row="2", and Column="2" results in a tile located at (2,2) where (0,0) is the top-left corner of a group.
+
+#### start:Tile
+
+You can use the **start:Tile** tag to pin a Universal Windows app to Start.
+
+To specify an app, you must set the **AppUserModelID** attribute to the application user model ID that's associated with the corresponding app. 
+
+The following example shows how to pin the Microsoft Edge Universal Windows app:
+
+```XML
+<start:Tile
+          AppUserModelID="Microsoft.MicrosoftEdge_8wekyb3d8bbwe!MicrosoftEdge"
+          Size="2x2"
+          Row="0"
+          Column="0"/>
+```
+
+#### start:SecondaryTile
+
+You can use the **start:SecondaryTile** tag to pin a Web link through a Microsoft Edge secondary tile. 
+
+The following example shows how to create a tile of the Web site's URL using the Microsoft Edge secondary tile:
+
+```XML
+<start:SecondaryTile
+          AppUserModelID="Microsoft.MicrosoftEdge_8wekyb3d8bbwe!MicrosoftEdge"
+          TileID="MyWeblinkTile"
+          Arguments="http://msn.com"
+          DisplayName="MySite"
+          Square150x150LogoUri="ms-appx:///Assets/MicrosoftEdgeSquare150x150.png" 
+          Wide310x150LogoUri="ms-appx:///Assets/MicrosoftEdgeWide310x150.png"
+          ShowNameOnSquare150x150Logo="true"
+          ShowNameOnWide310x150Logo="false"
+          BackgroundColor="#FF112233"
+          Size="2x2"
+          Row="0"
+          Column="4"/>
+```
+
+The following table describes the other attributes that you can use with the **start:SecondaryTile** tag in addition to **Size**, **Row**, and **Column**.
+
+| Attribute | Required/optional | Description |
+| --- | --- | --- |
+| AppUserModelID | Required | Must point to Microsoft Edge. |
+| TileID | Required | Must uniquely identify your Web site tile. |
+| Arguments | Required | Must contain the URL of your Web site. |
+| DisplayName | Required | Must specify the text that you want users to see. |
+| Square150x150LogoUri | Required | Specifies the logo to use on the 2x2 tile. |
+| Wide310x150LogoUri | Optional | Specifies the logo to use on the 4x2 tile. |
+| ShowNameOnSquare150x150Logo | Optional | Specifies whether the display name is shown on the 2x2 tile. You can set the value for this attribute to true or false. By default, this is set to false. |
+| ShowNameOnWide310x150Logo | Optional | Specifies whether the display name is shown on the 4x2 tile. You can set the value for this attribute to true or false. By default, this is set to false. |
+| BackgroundColor | Optional | Specifies the color of the tile. You can specify the value in ARGB hexadecimal (for example, #FF112233) or specify "transparent". |
+| ForegroundText | Optional | Specifies the color of the foreground text. Set the value to either "light" or "dark". |
+ 
+ Secondary Microsoft Edge tiles have the same size and location behavior as a Universal Windows app.
+
+#### start:PhoneLegacyTile
+
+You can use the **start:PhoneLegacyTile** tag to add a mobile app that has a valid ProductID, which you can find in the app's manifest file. The **ProductID** attribute must be set to the GUID of the app.
+
+The following example shows how to add a mobile app with a valid ProductID using the start:PhoneLegacyTile tag:
+
+```XML
+<start:PhoneLegacyTile 
+          ProductID="{00000000-0000-0000-0000-000000000000}"
+          Size="2x2"
+          Row="0"
+          Column="2"/>
+```
+
+#### start:Folder
+
+You can use the **start:Folder** tag to add a folder to the mobile device's Start screen.
+
+You must set these attributes to specify the size and location of the folder: **Size**, **Row**, and **Column**. 
+
+Optionally, you can also specify a folder name by using the **Name** attribute. If you specify a name, set the value to a string.
+
+The position of the tiles inside a folder is relative to the folder. You can add any of the following tile types to the folder:
+
+- Tile - Use to pin a Universal Windows app to Start.
+- SecondaryTile - Use to pin a Web link through a Microsoft Edge secondary tile. 
+- PhoneLegacyTile - Use to pin a mobile app that has a valid ProductID.
+
+The following example shows how to add a medium folder that contains two apps inside it:
+
+```XML
+<start:Folder
+          Name="Contoso apps"
+          Size="2x2"
+          Row="0"
+          Column="2">
+          <start:Tile
+                 AppUserModelID="Microsoft.BingMaps_8wekyb3d8bbwe!ApplicationID"
+                 Size="2x2"
+                 Row="0"
+                 Column="0"/>
+          <start:PhoneLegacyTile
+                 ProductID="{00000000-0000-0000-0000-000000000000}"
+                 Size="1x1"
+                 Row="0"
+                 Column="2"/>
+          </start:Folder>
+```
+
+#### RequiredStartTiles
+
+You can use the **RequiredStartTiles** tag to specify the tiles that will be pinned to the bottom of the Start screen even if a restored Start screen does not have the tiles during backup or restore.
+
+>[!NOTE]
+>Enabling this Start customization may be disruptive to the user experience.
+
+For Windows 10 Mobile, **RequiredStartTiles** tags can contain the following tags or elements. These are similar to the tiles supported in **start:Group**. 
+
+- Tile - Use to pin a Universal Windows app to Start.
+- SecondaryTile - Use to pin a Web link through a Microsoft Edge secondary tile. 
+- PhoneLegacyTile - Use to pin a mobile app that has a valid ProductID.
+- Folder - Use to pin a folder to the mobile device's Start screen.
+
+Tiles specified within the **RequiredStartTiles** tag have the following behavior:
+
+- The partner-pinned tiles will begin in a new row at the end of the user-restored Start screen. 
+- If there’s a duplicate tile between what the user has in their Start screen layout and what the OEM has pinned to the Start screen, only the app or tile shown in the user-restored Start screen layout will be shown and the duplicate tile will be omitted from the pinned partner tiles at the bottom of the Start screen.
+
+The lack of duplication only applies to pinned apps. Pinned Web links may be duplicated.
+
+- If partners have prepinned folders to the Start screen, Windows 10 treats these folders in the same way as appended apps on the Start screen. Duplicate folders will be removed. 
+- All partner tiles that are appended to the bottom of the user-restored Start screen will be medium-sized. There will be no gaps in the appended partner Start screen layout. Windows 10 will shift tiles accordingly to prevent gaps.
+
+## Sample LayoutModification.xml
+
+The following sample LayoutModification.xml shows how you can configure the Start layout for devices running Windows 10 Mobile:
+
+```XML
+<?xml version="1.0" encoding="utf-8"?>
+<LayoutModificationTemplate
+    xmlns="http://schemas.microsoft.com/Start/2014/LayoutModification"
+    xmlns:defaultlayout="http://schemas.microsoft.com/Start/2014/FullDefaultLayout"
+    xmlns:start="http://schemas.microsoft.com/Start/2014/StartLayout"
+    Version="1">
+    <DefaultLayoutOverride>
+      <StartLayoutCollection>
+            <defaultlayout:StartLayout>
+              <start:Group
+                Name="First Group">
+                  <start:Tile
+                    AppUserModelID="Microsoft.BingFinance_8wekyb3d8bbwe!ApplicationID"
+                    Size="2x2"
+                    Row="0"
+                    Column="0"/>
+                  <start:Tile
+                    AppUserModelID="Microsoft.BingMaps_8wekyb3d8bbwe!ApplicationID"
+                    Size="1x1"
+                    Row="0"
+                    Column="2"/>
+              </start:Group>
+            </defaultlayout:StartLayout>
+      </StartLayoutCollection>
+    </DefaultLayoutOverride>
+    <RequiredStartTiles>
+         <PhoneLegacyTile ProductID="{b00d3141-1caa-43aa-b0b5-78c1acf778fd}"/>
+         <PhoneLegacyTile ProductID="{C3F8E570-68B3-4D6A-BDBB-C0A3F4360A51}"/>
+         <PhoneLegacyTile ProductID="{C60904B7-8DF4-4C2E-A417-C8E1AB2E51C7}"/>
+         <Tile AppUserModelID="Microsoft.MicrosoftFeedback_8wekyb3d8bbwe!ApplicationID"/>
+    </RequiredStartTiles>
+</LayoutModificationTemplate>
+```
+
+## Use Windows Provisioning multivariant support
+
+The Windows Provisioning multivariant capability allows you to declare target conditions that, when met, supply specific customizations for each variant condition. For Start customization, you can create specific layouts for each variant that you have. To do this, you must create a separate LayoutModification.xml file for each variant that you want to support and then include these in your provisioning package. For more information on how to do this, see Create a provisioning package with multivariant settings.
+
+The provisioning engine chooses the right customization file based on the target conditions that were met, adds the file in the location that's specified for the setting, and then uses the specific file to customize Start. To differentiate between layouts, you can add modifiers to the LayoutModification.xml filename such as "LayoutCustomization1". Regardless of the modifier that you use, the provsioning engine will always output "LayoutCustomization.xml" so that the OS has a consistent file name to query against.
+
+For example, if you want to ensure that there's a specific layout for a certain mobile operator in a certain country/region, you can:
+1. Create a specific layout customization file and then name it LayoutCustomization1.xml.
+2. Include the file as part of your provisioning package.
+3. Create your multivariant target and reference the XML file within the target condition in the main customization XML file.
+
+The following example shows what the overall customization file might look like with multivariant support for Start:
+
+```XML
+<?xml version="1.0" encoding="utf-8"?>
+<WindowsCustomizatons>
+  <PackageConfig xmlns="urn:schemas-Microsoft-com:Windows-ICD-Package-Config.v1.0">
+    <ID>{6aaa4dfa-00d7-4aaa-8adf-73c6a7e2501e}</ID>
+    <Name>My Provisioning Package</Name>
+    <Version>1.0</Version>
+    <OwnerType>OEM</OwnerType>
+    <Rank>50</Rank>
+  </PackageConfig>
+  <Settings xmlns="urn:schemas-microsoft-com:windows-provisioning">
+    <Customizations>
+      <Targets>
+        <Target Id="Operator XYZ"> 
+          <TargetState> 
+            <Condition Name="MCC" Value="Range:310, 320" /> 
+            <Condition Name="MNC" Value="!Range:400, 550" /> 
+          </TargetState> 
+        </Target>
+        <Target Id="Processor ABC">
+          <TargetState>
+          <TargetState> 
+            <Condition Name="ProcessorName" Value="Pattern:.*Celeron.*" /> 
+            <Condition Name="ProcessorType" Value="Pattern:.*I|intel.*" /> 
+          </TargetState>
+          </TargetState>
+        </Target>
+      </Targets>
+      <Common>
+        <Settings> 
+          <Policies> 
+            <AllowBrowser>1</AllowBrowser> 
+            <AllowCamera>1</AllowCamera> 
+            <AllowBluetooth>1</AllowBluetooth> 
+          </Policies> 
+          <HotSpot> 
+            <Enabled>1</Enabled> 
+          </HotSpot> 
+        </Settings> 
+      </Common>
+      <Variant>
+        <TargetRefs>
+          <TargetRef Id="Operator XYZ" />
+        </TargetRefs>
+        <Settings>
+          <StartLayout>c:\users\<userprofile>\appdata\local\Microsoft\Windows\Shell\LayoutCustomization1.XML</StartLayout>
+          <HotSpot>
+            <Enabled>1</Enabled>
+          </HotSpot>
+        </Settings>
+      </Variant>
+    </Customizations>
+  </Settings>
+</WindowsCustomizatons>
+```
+
+When the condition is met, the provisioning engine takes the XML file and places it in the location that Windows 10 has set and then the Start subsystem reads the file and applies the specific customized layout.
+
+You must repeat this process for all variants that you want to support so that each variant can have a distinct layout for each of the conditions and targets that need to be supported. For example, if you add a **Language** condition, you can create a Start layout that has it's own localized group or folder titles.
+
+## Add the LayoutModification.xml file to the image
+
+Once you have created your LayoutModification.xml file to customize devices that will run Windows 10 Mobile, you can use Windows ICD to add the XML file to the device:
+
+1. In the **Available customizations** pane, expand **Runtime settings**, select **Start** and then click the **StartLayout** setting.
+2. In the middle pane, click **Browse** to open File Explorer.
+3. In the File Explorer window, navigate to the location where you saved your LayoutModification.xml file. 
+4. Select the file and then click **Open**. 
+
+This should set the value of **StartLayout**. The setting appears in the **Selected customizations** pane.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+## Related topics
+
+
+[Manage Windows 10 Start layout options](windows-10-start-layout-options-and-policies.md)
+
+[Configure Windows 10 taskbar](configure-windows-10-taskbar.md)
+
+[Customize Windows 10 Start and taskbar with Group Policy](customize-windows-10-start-screens-by-using-group-policy.md)
+
+[Customize Windows 10 Start and taskbar with ICD and provisioning packages](customize-windows-10-start-screens-by-using-provisioning-packages-and-icd.md)
+
+[Customize Windows 10 Start with mobile device management (MDM)](customize-windows-10-start-screens-by-using-mobile-device-management.md)
+
+[Changes to Group Policy settings for Windows 10 Start](changes-to-start-policies-in-windows-10.md)
+
+ 
+
+ 
+
+
+
+
+
--- a/windows/manage/troubleshoot-windows-store-for-business.md
+++ b/windows/manage/troubleshoot-windows-store-for-business.md
@ -53,7 +53,7 @@ The private store for your organization is a page in the Windows Store app that

 ## Still having trouble?

-If you are still having trouble using WSfB or installing the app, you can get more help on our [Support page](https://go.microsoft.com/fwlink/?LinkID=799757).
+If you are still having trouble using WSfB or installing the app, you can get more help on our [Support page](https://go.microsoft.com/fwlink/?LinkID=799386).
                                
  

--- a/windows/manage/waas-configure-wufb.md
+++ b/windows/manage/waas-configure-wufb.md
@ -115,7 +115,7 @@ You can set your system to receive updates for other Microsoft products—known
 | --- | --- |
 | GPO for version 1607: </br>Computer Configuration > Administrative Templates > Windows Components > Windows Update > Defer Windows Updates > **Select when Quality Updates are received** | \Policies\Microsoft\Windows\WindowsUpdate\DeferQualityUpdates</br>\Policies\Microsoft\Windows\WindowsUpdate\DeferQualityUpdatesPeriodInDays  |
 | GPO for version 1511: </br>Computer Configuration > Administrative Templates > Windows Components > Windows Update > **Defer Upgrades and Updates** | \Policies\Microsoft\Windows\WindowsUpdate\DeferUpdatePeriod |
-| MDM for version 1607: </br>../Vendor/MSFT/Policy/Config/Update/</br>**DeferQualityUpdates** | \Microsoft\PolicyManager\default\Update\DeferQualityUpdatesPeriodInDays |
+| MDM for version 1607: </br>../Vendor/MSFT/Policy/Config/Update/</br>**DeferQualityUpdatesPeriodInDays** | \Microsoft\PolicyManager\default\Update\DeferQualityUpdatesPeriodInDays |
 | MDM for version 1511: </br>../Vendor/MSFT/Policy/Config/Update/</br>**DeferUpgrade** | \Microsoft\PolicyManager\default\Update\RequireDeferUpdate  |


--- a/windows/manage/waas-integrate-wufb.md
+++ b/windows/manage/waas-integrate-wufb.md
@ -23,10 +23,10 @@ You can integrate Windows Update for Business deployments with existing manageme
 ## Integrate Windows Update for Business with Windows Server Update Services


-For Windows 10, version 1607, devices can now be configured to receive updates from both Windows Update and Windows Server Update Services (WSUS).  In a joint WSUS and Windows Update for Business setup:
+For Windows 10, version 1607, devices can now be configured to receive updates from both Windows Update (or Microsoft Update) and Windows Server Update Services (WSUS).  In a joint WSUS and Windows Update for Business setup:

 - Devices will receive their Windows content from Microsoft and defer these updates according to Windows Update for Business policy
- All other content synced from WSUS will be directly applied to the device; that is, non-Windows Updates content will not follow your Windows Update for Business deferral policies
+- All other content synced from WSUS will be directly applied to the device; that is, updates to products other than Windows will not follow your Windows Update for Business deferral policies

 ### Configuration example \#1: Deferring Windows Update updates with other update content hosted on WSUS

@ -34,13 +34,13 @@ For Windows 10, version 1607, devices can now be configured to receive updates f

 - Device is configured to defer Windows Quality Updates using Windows Update for Business
 - Device is also configured to be managed by WSUS
- Device is not configured to include Microsoft Updates from Windows Update (**Update/AllowMUUpdateService** = not enabled)
- Admin has opted to put Microsoft updates on WSUS
+- Device is not configured to enable Microsoft Update (**Update/AllowMUUpdateService** = not enabled)
+- Admin has opted to put updates to Office and other products on WSUS
 - Admin has also put 3rd party drivers on WSUS

 <table><thead><th>Content</th><th>Metadata source</th><th>Payload source</th><th>Deferred?</th><th></th></thead>
-<tbody><tr><td>Windows Update</td><td>Windows Update</td><td>Windows Update</td><td>Yes</td><td rowspan="3">![diagram of content flow](images/wufb-config1a.png)</td></tr>
-<tr><td>Microsoft Update (such as Office updates)</td><td>WSUS</td><td>WSUS</td><td>No</td></tr>
+<tbody><tr><td>Updates to Windows</td><td>Windows Update</td><td>Windows Update</td><td>Yes</td><td rowspan="3">![diagram of content flow](images/wufb-config1a.png)</td></tr>
+<tr><td>Updates to Office and other products</td><td>WSUS</td><td>WSUS</td><td>No</td></tr>
 <tr><td>Third-party drivers</td><td>WSUS</td><td>WSUS</td><td>No</td></tr>
 </table>

@ -54,10 +54,9 @@ For Windows 10, version 1607, devices can now be configured to receive updates f


 <table><thead><th>Content</th><th>Metadata source</th><th>Payload source</th><th>Deferred?</th><th></th></thead>
-<tbody><tr><td>Windows Update (exclude driver)</td><td>Windows Update</td><td>Windows Update</td><td>Yes</td><td rowspan="4">![diagram of content flow](images/wufb-config2.png)</td></tr>
-<tr><td>Windows Update drivers</td><td>WSUS</td><td>WSUS</td><td>No</td></tr>
-<tr><td>Microsoft Update (such as Office updates)</td><td>WSUS</td><td>WSUS</td><td>No</td></tr>
-<tr><td>Windows drivers, third-party drivers</td><td>WSUS</td><td>WSUS</td><td>No</td></tr>
+<tbody><tr><td>Updates to Windows (excluding drivers)</td><td>Windows Update</td><td>Windows Update</td><td>Yes</td><td rowspan="4">![diagram of content flow](images/wufb-config2.png)</td></tr>
+<tr><td>Updates to Office and other products</td><td>WSUS</td><td>WSUS</td><td>No</td></tr>
+<tr><td>Drivers</td><td>WSUS</td><td>WSUS</td><td>No</td></tr>

 </table>

@ -66,18 +65,18 @@ For Windows 10, version 1607, devices can now be configured to receive updates f
 **Configuration:**

 - Device is configured to defer Quality Updates using Windows Update for Business and to be managed by WSUS
- Device is configured to “receive updates for other Microsoft products” along with Windows Update updates (**Update/AllowMUUpdateService** = enabled)
- Admin has also placed Microsoft Update content on the WSUS server
+- Device is configured to “receive updates for other Microsoft products” along with updates to Windows (**Update/AllowMUUpdateService** = enabled)
+- Admin has also placed Microsoft Update, third-paprty, and locally-published update content on the WSUS server

-In this example, the Microsoft Update deferral behavior is slightly different than if WSUS were not enabled. 
- In a non-WSUS case, the Microsoft Update updates would be deferred just as any Windows Update update would be.  
- However, with WSUS also configured, Microsoft Update content is sourced from Microsoft but deferral policies are not applied.  
+In this example, the deferral behavior for updates to Office and other non-Windows products is slightly different than if WSUS were not enabled. 
+- In a non-WSUS case, these updates would be deferred just as any update to Windows would be.  
+- However, with WSUS also configured, these updates are sourced from Microsoft but deferral policies are not applied.  


 <table><thead><th>Content</th><th>Metadata source</th><th>Payload source</th><th>Deferred?</th><th></th></thead>
-<tbody><tr><td>Windows Update (exclude drivers)</td><td>Windows Update</td><td>Windows Update</td><td>Yes</td><td rowspan="3">![diagram of content flow](images/wufb-config3a.png)</td></tr>
-<tr><td>Microsoft Update (such as Office updates)</td><td>Microsoft Update</td><td>Microsoft Update</td><td>No</td></tr>
-<tr><td>Drivers, third-party</td><td>WSUS</td><td>WSUS</td><td>No</td></tr>
+<tbody><tr><td>Updates to Windows (excluding drivers)</td><td>Microsoft Update</td><td>Microsoft Update</td><td>Yes</td><td rowspan="3">![diagram of content flow](images/wufb-config3a.png)</td></tr>
+<tr><td>Updates to Office and other products</td><td>Microsoft Update</td><td>Microsoft Update</td><td>No</td></tr>
+<tr><td>Drivers, third-party applications</td><td>WSUS</td><td>WSUS</td><td>No</td></tr>
 </table>

 >[!NOTE]
--- a/windows/manage/waas-manage-updates-wsus.md
+++ b/windows/manage/waas-manage-updates-wsus.md
@ -29,7 +29,7 @@ To be able to use WSUS to manage and deploy Windows 10 feature updates, you must

 ## WSUS scalability

-To use WSUS to manage all Windows updates, some organizations may need access to WSUS from a demilitarized zone, or they might have some other complex scenario. WSUS is highly scalable and configurable for organizations of any size or site layout. For specific information about scaling WSUS, including upstream and downstream server configuration, branch offices, WSUS load balancing, and other complex scenarios, see [Choose a Type of WSUS Deployment](https://technet.microsoft.com/library/cc720448%28v=ws.10%29.aspx).
+To use WSUS to manage all Windows updates, some organizations may need access to WSUS from a perimeter network, or they might have some other complex scenario. WSUS is highly scalable and configurable for organizations of any size or site layout. For specific information about scaling WSUS, including upstream and downstream server configuration, branch offices, WSUS load balancing, and other complex scenarios, see [Choose a Type of WSUS Deployment](https://technet.microsoft.com/library/cc720448%28v=ws.10%29.aspx).
 

 ## Express Installation Files
--- a/windows/manage/waas-manage-updates-wufb.md
+++ b/windows/manage/waas-manage-updates-wufb.md
@ -18,7 +18,7 @@ localizationpriority: high

 > **Looking for consumer information?** See [Windows Update: FAQ](https://support.microsoft.com/help/12373/windows-update-faq) 

-Windows Update for Business enables information technology administrators to keep the Windows 10 devices in their organization always up to date with the latest security defenses and Windows features by directly connecting these systems to Windows Update service.  You can use Group Policy or MDM solutions such as Intune to configure the Windows Update for Business settings. Using Group Policy or MDM solutions such as Intune, you can control how and when Windows 10 devices are updated. In addition, by using Intune, organizations can manage devices that are not joined to a domain at all or are joined to Microsoft Azure Active Directory (Azure AD) alongside your on-premises domain-joined machines.  
+Windows Update for Business enables information technology administrators to keep the Windows 10 devices in their organization always up to date with the latest security defenses and Windows features by directly connecting these systems to Windows Update service.  You can use Group Policy or MDM solutions such as Intune to configure the Windows Update for Business settings that control how and when Windows 10 devices are updated. In addition, by using Intune, organizations can manage devices that are not joined to a domain at all or are joined to Microsoft Azure Active Directory (Azure AD) alongside your on-premises domain-joined machines.  

 Specifically, Windows Update for Business allows for: 

@ -37,7 +37,7 @@ Windows Update for Business provides three types of updates to Windows 10 device
 - **Quality Updates**: these are traditional operating system updates, typically released the second Tuesday of each month (though they can be released at any time).  These include security, critical, and driver updates. Windows Update for Business also treats non-Windows updates (such as those for Microsoft Office or Visual Studio) as Quality Updates. These non-Windows Updates are known as *Microsoft Updates* and devices can be optionally configured to receive such updates along with their Windows Updates.
 - **Non-deferrable updates**: Currently, antimalware and antispyware Definition Updates from Windows Update cannot be deferred.
 
-Both Feature and Quality Updates can be deferred from deploying to client devices by a Windows Update for Business administrator within a bounded rage of time from when those updates are first made available on the Windows Update Service. This deferral capability allows administrators to validate deployments as they are pushed to all client devices configured for Windows Update for Business.
+Both Feature and Quality Updates can be deferred from deploying to client devices by a Windows Update for Business administrator within a bounded range of time from when those updates are first made available on the Windows Update Service. This deferral capability allows administrators to validate deployments as they are pushed to all client devices configured for Windows Update for Business.

 <table>
 <tr>
--- a/windows/manage/waas-overview.md
+++ b/windows/manage/waas-overview.md
@ -25,7 +25,7 @@ The Windows 10 operating system introduces a new way to build, deploy, and servi

 Prior to Windows 10, Microsoft released new versions of Windows every few years. This traditional deployment schedule imposed a training burden on users because the feature revisions were often significant. That schedule also meant waiting long periods without new features — a scenario that doesn’t work in today’s rapidly changing world, a world in which new security, management, and deployment capabilities are necessary to address challenges. Windows as a service will deliver smaller feature updates two to three times per year to help address these issues.

-In the past, when Microsoft developed new versions of Windows, it typically released technical previews near the end of the process, whehn Windows was nearly ready to ship. With Windows 10, new features will be delivered to the [Windows Insider community](https://insider.windows.com/) as soon as possible — during the development cycle, through a process called *flighting* — so that organizations can see exactly what Microsoft is developing and start their testing as soon as possible. 
+In the past, when Microsoft developed new versions of Windows, it typically released technical previews near the end of the process, when Windows was nearly ready to ship. With Windows 10, new features will be delivered to the [Windows Insider community](https://insider.windows.com/) as soon as possible — during the development cycle, through a process called *flighting* — so that organizations can see exactly what Microsoft is developing and start their testing as soon as possible. 

 Microsoft also depends on receiving feedback from organizations throughout the development process so that it can make adjustments as quickly as possible rather than waiting until after release. For more information about the Windows Insider Program and how to sign up, see the section [Windows Insider](#windows-insider).

@ -68,7 +68,7 @@ With Windows 10, Microsoft will package new features into feature updates that c

 Monthly updates in previous Windows versions were often overwhelming because of the sheer number of updates available each month. Many organizations selectively chose which updates they wanted to install and which they didn’t, and this created countless scenarios in which organizations deployed essential security updates but picked only a subset of nonsecurity fixes.

-In Windows 10, rather than receiving several updates each month and trying to figure out which the organization needs, which ultimately causes platform fragmentation, administrators will see one cumulative monthly update that supersedes the previous month’s update, containing both security and nonsecurity fixes. This approach makes patching simpler and ensures that customers’ devices are more closely aligned with the testing done at Microsoft, reducing unexpected issues resulting from patching. The left side of Figure 1 provides an example of Windows 7 machines in an enterprise and what their current patch level might look like. On the right is what Microsoft’s test environment PCs contain. This drastic difference is the basis for many compatibility issues and system anomalies related to Windows updates.
+In Windows 10, rather than receiving several updates each month and trying to figure out which the organization needs, which ultimately causes platform fragmentation, administrators will see one cumulative monthly update that supersedes the previous month’s update, containing both security and nonsecurity fixes. This approach makes patching simpler and ensures that customers’ devices are more closely aligned with the testing done at Microsoft, reducing unexpected issues resulting from patching. The left side of Figure 1 provides an example of Windows 7 devices in an enterprise and what their current patch level might look like. On the right is what Microsoft’s test environment PCs contain. This drastic difference is the basis for many compatibility issues and system anomalies related to Windows updates.

 **Figure 1**

@ -78,7 +78,7 @@ In Windows 10, rather than receiving several updates each month and trying to fi

 ## Servicing branches 

-To align with the new method of delivering feature updates and quality updates in Windows 10, Microsoft introduced the concept of servicing branches to allow customers to designate how aggressively their individual machines are updated. For example, an organization may have test machines that the IT department can update with new features as soon as possible, and then specialized devices that require a longer feature update cycle to ensure continuity. With that in mind, Microsoft offers three servicing branches for Windows 10: Current Branch (CB), Current Branch for Business (CBB), and Long-Term Servicing Branch (LTSB). In addition, the Windows Insider Program provides IT pros and other interested parties with prerelease Windows builds that they can test and ultimately provide feedback on to Microsoft. For details about the versions in each servicing branch, see [Windows 10 release information](https://technet.microsoft.com/windows/release-info.aspx).
+To align with the new method of delivering feature updates and quality updates in Windows 10, Microsoft introduced the concept of servicing branches to allow customers to designate how aggressively their individual devices are updated. For example, an organization may have test devices that the IT department can update with new features as soon as possible, and then specialized devices that require a longer feature update cycle to ensure continuity. With that in mind, Microsoft offers three servicing branches for Windows 10: Current Branch (CB), Current Branch for Business (CBB), and Long-Term Servicing Branch (LTSB). In addition, the Windows Insider Program provides IT pros and other interested parties with prerelease Windows builds that they can test and ultimately provide feedback on to Microsoft. For details about the versions in each servicing branch, see [Windows 10 release information](https://technet.microsoft.com/windows/release-info.aspx).

 The concept of servicing branches is new, but organizations can use the same management tools they used to manage updates and upgrades in previous versions of Windows. For more information about the servicing tool options for Windows 10 and their capabilities, see [Servicing tools](#servicing-tools).

@ -90,7 +90,7 @@ The concept of servicing branches is new, but organizations can use the same man

 In the CB servicing model, feature updates are available as soon as Microsoft releases them. Windows 10 version 1511 had few servicing tool options to delay CB feature updates, limiting the use of the CB servicing branch. Windows 10 version 1607, however, includes more servicing tools that can delay CB feature updates for up to 180 days. The CB servicing model is ideal for pilot deployments and testing of Windows 10 feature updates and for users such as developers who need to work with the latest features immediately.

-When Microsoft officially releases a feature update for Windows 10, that update is marked for CB, making it available to any PC not configured to defer feature updates so that those machines can immediately install it. Organizations that use Windows Server Update Services (WSUS), Microsoft System Center Configuration Manager, or Windows Update for Business, however, can defer CB feature updates to selective machines by withholding their approval and deployment. In this scenario, the content available for CB will be available but not necessarily immediately mandatory, depending on the policy of the management system. Only one CB build of Windows is supported at a time, so those clients not on the most current build will not receive quality updates (after a 60 day grace period) until the most current feature update has been installed. For more details about Windows 10 servicing tools, see [Servicing tools](#servicing-tools).
+When Microsoft officially releases a feature update for Windows 10, that update is marked for CB, making it available to any PC not configured to defer feature updates so that those devices can immediately install it. Organizations that use Windows Server Update Services (WSUS), Microsoft System Center Configuration Manager, or Windows Update for Business, however, can defer CB feature updates to selective devices by withholding their approval and deployment. In this scenario, the content available for CB will be available but not necessarily immediately mandatory, depending on the policy of the management system. Only one CB build of Windows is supported at a time, so those clients not on the most current build will not receive quality updates (after a 60 day grace period) until the most current feature update has been installed. For more details about Windows 10 servicing tools, see [Servicing tools](#servicing-tools).


 ### Current Branch for Business
@ -105,7 +105,7 @@ Basically, CBB is a configuration state, meaning that if a computer has the **De

 ### Long-term Servicing Branch

-Specialized systems—such as PCs that control medical equipment, point-of-sale systems, and ATMs—often require a longer servicing option because of their purpose. These devices typically perform a single important task and don’t need feature updates as frequently as other machines in the organization. It’s more important that these devices be kept as stable and secure as possible than up to date with user interface changes. The LTSB servicing model prevents Windows 10 Enterprise LTSB devices from receiving the usual feature updates and provides only quality updates to ensure that device security stays up to date. With this in mind, quality updates are still immediately available to Windows 10 Enterprise LTSB clients, but customers can choose to defer them by using one of the servicing tools mentioned in the section Servicing tools.
+Specialized systems—such as PCs that control medical equipment, point-of-sale systems, and ATMs—often require a longer servicing option because of their purpose. These devices typically perform a single important task and don’t need feature updates as frequently as other devices in the organization. It’s more important that these devices be kept as stable and secure as possible than up to date with user interface changes. The LTSB servicing model prevents Windows 10 Enterprise LTSB devices from receiving the usual feature updates and provides only quality updates to ensure that device security stays up to date. With this in mind, quality updates are still immediately available to Windows 10 Enterprise LTSB clients, but customers can choose to defer them by using one of the servicing tools mentioned in the section Servicing tools.

 >[!NOTE]
 >LTSB is not intended for deployment on most or all the PCs in an organization; it should be used only for special-purpose devices.  As a general guideline, a PC with Microsoft Office installed is a general-purpose device, typically used by an information worker, and therefore it is better suited for the CB or CBB servicing branch.
@ -122,7 +122,7 @@ LTSB is available only in the Windows 10 Enterprise LTSB edition. This build of

 ### Windows Insider

-For many IT pros, gaining visibility into feature updates early—before they’re available to the CB servicing branch—can be both intriguing and valuable for future end user communications as well as provide additional prestaging for CB machines. With Windows 10, feature flighting enables Windows Insiders to consume and deploy preproduction code to their test machines, gaining early visibility into the next build. Testing the early builds of Windows 10 helps both Microsoft and its customers because they have the opportunity to discover possible issues before the update is ever publicly available and can report it to Microsoft. Also, as flighted builds get closer to their release to CB, organizations can test their deployment on test machines for compatibility validation. 
+For many IT pros, gaining visibility into feature updates early—before they’re available to the CB servicing branch—can be both intriguing and valuable for future end user communications as well as provide additional prestaging for CB machines. With Windows 10, feature flighting enables Windows Insiders to consume and deploy preproduction code to their test machines, gaining early visibility into the next build. Testing the early builds of Windows 10 helps both Microsoft and its customers because they have the opportunity to discover possible issues before the update is ever publicly available and can report it to Microsoft. Also, as flighted builds get closer to their release to CB, organizations can test their deployment on test devices for compatibility validation. 

 Microsoft recommends that all organizations have at least a few PCs enrolled in the Windows Insider Program and provide feedback on any issues they encounter. For information about how to sign up for the Windows Insider Program and enroll test devices, go to [https://insider.windows.com](https://insider.windows.com).

@ -136,7 +136,7 @@ Microsoft recommends that all organizations have at least a few PCs enrolled in
 There are many tools with which IT pros can service Windows as a service. Each option has its pros and cons, ranging from capabilities and control to simplicity and low administrative requirements. The following are examples of the servicing tools available to manage Windows as a service updates:

 - **Windows Update (stand-alone)** provides limited control over feature updates, with IT pros manually configuring the device to be in the CBB servicing branch. Organizations can control which devices defer updates and stay in the CBB servicing branch or remain in CB by selecting the Defer upgrades check box in Start\Settings\Update & Security\Advanced Options on a Windows 10 client.
- **Windows Update for Business** is the second option for servicing Windows as a service. This servicing tool includes a little more control over update deferment and provides centralized management using Group Policy. In Windows 10 version 1511, Windows Update for Business can be used to defer feature updates for up to 8 months and quality updates for up to 4 weeks. Also, these deferment options were available only to clients in the CBB servicing branch. In Windows 10 version 1607 and later, Windows Update for Business can be used to defer feature updates for up to 180 days and quality updates for up to 30 days. These deployment options are available to clients in either the CB or CBB servicing branch. In addition to being able to use Group Policy to manage Windows Update for Business, either option can be configured without requiring any on-premises infrastructure by using Intune. In addition to Intune, organizations can use Group Policy to manage Windows Update for Business. 
+- **Windows Update for Business** is the second option for servicing Windows as a service. This servicing tool includes a little more control over update deferment and provides centralized management using Group Policy. In Windows 10 version 1511, Windows Update for Business can be used to defer feature updates for up to 8 months and quality updates for up to 4 weeks. Also, these deferment options were available only to clients in the CBB servicing branch. In Windows 10 version 1607 and later, Windows Update for Business can be used to defer feature updates for up to 180 days and quality updates for up to 30 days. These deployment options are available to clients in either the CB or CBB servicing branch. In addition to being able to use Group Policy to manage Windows Update for Business, either option can be configured without requiring any on-premises infrastructure by using Intune.
 - **Windows Server Update Services (WSUS)** provides extensive control over Windows 10 updates and is natively available in the Windows Server operating system. In addition to the ability to defer updates, organizations can add an approval layer for updates and choose to deploy them to specific computers or groups of computers whenever ready. 
 - **System Center Configuration Manager** provides the greatest control over servicing Windows as a service. IT pros can defer updates, approve them, and have multiple options for targeting deployments and managing bandwidth usage and deployment times. 

@ -172,6 +172,7 @@ or [Manage Windows 10 updates using System Center Configuration Manager](waas-ma
 ## Related topics

 - [Update Windows 10 in the enterprise](waas-update-windows-10.md)
+- [Quick guide to Windows as a service](waas-quick-start.md)
 - [Manage updates for Windows 10 Mobile Enterprise and Windows 10 IoT Mobile](waas-mobile-updates.md) 
 - [Configure Delivery Optimization for Windows 10 updates](waas-delivery-optimization.md)
 - [Configure BranchCache for Windows 10 updates](waas-branchcache.md)
--- a/windows/manage/waas-quick-start.md
+++ b/windows/manage/waas-quick-start.md
@ -0,0 +1,82 @@
+---
+title: Quick guide to Windows as a service (Windows 10)
+description: In Windows 10, Microsoft has streamlined servicing to make operating system updates simpler to test, manage, and deploy.
+ms.prod: w10
+ms.mktglfcycl: manage
+ms.sitesec: library
+author: jdeckerMS
+localizationpriority: high
+---
+
+# Quick guide to Windows as a service
+
+
+**Applies to**
+
+- Windows 10
+- Windows 10 Mobile
+- Windows 10 IoT Mobile
+
+Windows as a service is a new concept, introduced with the release of Windows 10.  While [an extensive set of documentation](waas-update-windows-10.md) is available explaining all the specifics and nuances, here is a quick guide to the most important concepts.
+
+## Definitions
+
+Some new terms have been introduced as part of Windows as a service, so you should know what these terms mean.
+- **Feature updates** will be released two to three times per year.  As the name suggests, these will add new features to Windows 10, delivered in bite-sized chunks compared to the previous practice of Windows releases every 3-5 years.
+- **Quality updates** are released monthly, delivering both security and non-security fixes.  These are cumulative, so installing the latest quality update is sufficient to get all the available fixes for a specific Windows 10 feature update.
+- **Insider Preview** builds are made available during the development of the features that will be shipped in the next feature update, enabling organizations to validate new features as well as compatibility with existing apps and infrastructure, providing feedback to Microsoft on any issues encountered.
+- **Servicing branches** allow organizations to choose when to deploy new features.  Current Branch (CB) deploys the fastest, soon after a feature update is released.  Current Branch for Business (CBB) defers the installation of the same feature update by about four months, until that feature update is considered ready for broad deployment. Long Term Servicing Branch (LTSB) is different, used only for specialized devices (which typically don’t run Office) such as those that control medical equipment or ATM machines that need to be kept stable and secure.
+- **Deployment rings** are groups of devices used to initially pilot, and then to broadly deploy, each feature update in an organization.  
+
+See [Overview of Windows as a service](waas-overview.md) for more information.
+
+## Key Concepts
+
+New feature update releases are initially considered **Current Branch (CB) releases**; organizations will use these for pilot deployments to ensure compatibility with existing apps and infrastructure.  After about four months, the feature update will be declared as **Current Branch for Business (CBB)**, indicating that it is ready for broad deployment.
+
+Each Windows 10 feature update (which initially begins as CB and then is declared as CBB) will be serviced with quality updates for a minimum of 18 months after it is released.  The total length of time can be longer, as there will be two CBB releases serviced at all times.  There will be a minimum of 60 days advanced notice (a grace period) after a CBB declaration occurs before an older feature update is no longer serviced. 
+
+Windows 10 Enterprise LTSB is a separate **Long Term Servicing Branch (LTSB)** version.  Each release is supported for a total of 10 years (five years standard support, five years extended support).  New releases are expected about every three years.
+
+See [Assign devices to servicing branches for Windows 10 updates](waas-servicing-branches-windows-10-updates.md) for more information.
+
+## Staying up to date
+
+The process for keeping Windows 10 up to date involves deploying a feature update, at an appropriate time after its release.  A variety of tools management and patching tools such as Windows Update, Windows Update for Business, Windows Server Update Services, System Center Configuration Manager, and third-party products) can be used to help with this process.  [Windows Upgrade Analytics](https://www.microsoft.com/en-us/WindowsForBusiness/upgrade-analytics), a free tool to streamline Windows upgrade projects, is another important tool to help.
+
+Because app compatibility, both for desktop apps and web apps, is outstanding with Windows 10, extensive advanced testing isn’t required.  Instead, only business-critical apps need to be tested, with the remaining apps validated through a series of pilot deployment rings.  Once these pilot deployments have validated most apps and CBB has been declared, broad deployment can begin.
+
+This process repeats with each new feature update, two to three times per year.  These are small deployment projects, compared to the big projects that were necessary with the old three-to-five-year Windows release cycles.
+
+Additional technologies such as BranchCache and Delivery Optimization, both peer-to-peer distribution tools, can help with the distribution of the feature update installation files.
+
+See [Build deployment rings for Windows 10 updates](waas-deployment-rings-windows-10-updates.md) and [Optimize update delivery for Windows 10 updates](waas-optimize-windows-10-updates.md) for more information.
+
+## Video: An overview of Windows as a service
+
+<iframe width="560" height="315" src="https://www.youtube.com/embed/MLc4-Suv0LU" frameborder="0" allowfullscreen></iframe> 
+ 
+## Learn more
+
+[Adopting Windows as a service at Microsoft](https://www.microsoft.com/itshowcase/Article/Content/851/Adopting-Windows-as-a-service-at-Microsoft)
+
+
+## Related topics
+
+- [Update Windows 10 in the enterprise](waas-update-windows-10.md)
+- [Manage updates for Windows 10 Mobile Enterprise and Windows 10 IoT Mobile](waas-mobile-updates.md) 
+- [Configure Delivery Optimization for Windows 10 updates](waas-delivery-optimization.md)
+- [Configure BranchCache for Windows 10 updates](waas-branchcache.md)
+- [Configure Windows Update for Business](waas-configure-wufb.md)
+- [Integrate Windows Update for Business with management solutions](waas-integrate-wufb.md)
+- [Walkthrough: use Group Policy to configure Windows Update for Business](waas-wufb-group-policy.md)
+- [Walkthrough: use Intune to configure Windows Update for Business](waas-wufb-intune.md)
+- [Manage device restarts after updates](waas-restart.md)
+
+
+
+
+
+
+
+
--- a/windows/manage/waas-restart.md
+++ b/windows/manage/waas-restart.md
@ -27,7 +27,7 @@ When you set the **Configure Automatic Updates** policy to **Auto download and s
 When **Configure Automatic Updates** is enabled, you can enable one of the following additional policies to manage device restart:

 - **Turn off auto-restart for updates during active hours** prevents automatic restart during active hours.
- **Always automatically restart at the scheduled time** forces a restart after the specified installation time and lets you configure a timer to warn a signed-in user that a restart is going to occur.
+- **Always automatically restart at the scheduled time** forces a restart after the specified installation time and lets you configure a timer to warn a signed-in user that a restart is going to occur. To set the time, you need to go **Configure Automatic Updates**, select option **4 - Auto download and schedule the install**, and then enter a time in the **Scheduled install time** dropdown.
 - **No auto-restart with logged on users for scheduled automatic updates installations** prevents automatic restart when a user is signed in. If a user schedules the restart in the update notification, the device will restart at the time the user specifies even if a user is signed in at the time. This policy only applies when **Configure Automatic Updates** is set to option **4-Auto download and schedule the install**. 

 ## Configure active hours
--- a/windows/manage/waas-servicing-branches-windows-10-updates.md
+++ b/windows/manage/waas-servicing-branches-windows-10-updates.md
@ -127,7 +127,7 @@ During the life of a device, it may be necessary or desirable to switch between
 </tr>
 <tr class="even">
 <td align="left">Current Branch for Business</td>
-<td align="left">Not directly possible, because Windows Insider Program machines are automatically upgraded to the Current Branch release at the end of the development cycle.</td>
+<td align="left">Not directly possible, because Windows Insider Program devices are automatically upgraded to the Current Branch release at the end of the development cycle.</td>
 </tr>
 <tr class="odd">
 <td align="left">Long-Term Servicing Branch</td>
@ -153,7 +153,7 @@ During the life of a device, it may be necessary or desirable to switch between
 </tr>
 <tr class="even">
 <td align="left">Current Branch</td>
-<td align="left">Disable the <strong>Defer upgrade</strong> setting, or move the PC to a target group or flight that will receive the latest Current Branch release.</td>
+<td align="left">Disable the <strong>Defer upgrade</strong> setting, or move the device to a target group or flight that will receive the latest Current Branch release.</td>
 </tr>
 <tr class="odd">
 <td align="left">Long-Term Servicing Branch</td>
--- a/windows/manage/waas-update-windows-10.md
+++ b/windows/manage/waas-update-windows-10.md
@ -21,12 +21,15 @@ localizationpriority: high
 Windows as a service provides a new way to think about building, deploying, and servicing the Windows operating system. The Windows as a service model is focused on continually providing new capabilities and updates while maintaining a high level of hardware and software compatibility. Deploying new versions of Windows is simpler than ever before: Microsoft releases new features two to three times per year rather than the traditional upgrade cycle where new features are only made available every few years. Ultimately, this model replaces the need for traditional Windows deployment projects, which can be disruptive and costly, and spreads the required effort out into a continuous updating process, reducing the overall effort required to maintain Windows 10 devices in your environment. In addition, with the Windows 10 operating system, organizations have the chance to try out “flighted” builds of Windows as Microsoft develops them, gaining insight into new features and the ability to provide continual feedback about them. 

 >[!TIP]
->See [Windows 10 update history](https://support.microsoft.com/help/12387/windows-10-update-history) for details about each Windows 10 update released to date.  
+>See [Windows 10 update history](https://support.microsoft.com/help/12387/windows-10-update-history) for details about each Windows 10 update released to date. 
+
+ 

 ## In this section

 | Topic | Description|
 | --- | --- |
+| [Quick guide to Windows as a service](waas-quick-start.md) | Provides a brief summary of the key points for the new servicing model for Windows 10. |
 | [Overview of Windows as a service](waas-overview.md) | Explains the differences in building, deploying, and servicing Windows 10; introduces feature updates, quality updates, and the different servicing branches; compares servicing tools. |
 | [Prepare servicing strategy for Windows 10 updates](waas-servicing-strategy-windows-10-updates.md) | Explains the decisions you need to make in your servicing strategy.  |
 | [Build deployment rings for Windows 10 updates](waas-deployment-rings-windows-10-updates.md) | Explains how to make use of servicing branches and update deferrals to manage Windows 10 updates.  |
--- a/windows/manage/windows-10-mobile-and-mdm.md
+++ b/windows/manage/windows-10-mobile-and-mdm.md
@ -713,8 +713,8 @@ Microsoft aspires to update Windows 10 Mobile devices with the latest updates au
 <td align="left"><strong>Cellular</strong></td>
 <td align="left">Device is only connected to a cellular network (standard data charges apply)</td>
 <td align="left">Will skip a daily scan if scan was successfully completed in the last 5 days</td>	      
-<td align="left">Will only occur if update package is small and does not exceed the mobile operator data limit or the user clicks “download now”.</td>
-<td align="left">Yes, if the user clicked “download now”</td>	      
+<td align="left">Will only occur if update package is small and does not exceed the mobile operator data limit.</td>
+<td align="left">Yes</td>	      
 <td align="left">Idem</td>	      
 </tr>
 <tr class="even">
--- a/windows/manage/windows-10-start-layout-options-and-policies.md
+++ b/windows/manage/windows-10-start-layout-options-and-policies.md
@ -68,12 +68,12 @@ The following table lists the different parts of Start and any applicable policy
 </tr>
 <tr class="even">
 <td align="left">Recently added</td>
-<td align="left"></td>
+<td align="left">not applicable</td>
 <td align="left"><strong>Settings</strong> &gt; <strong>Personalization</strong> &gt; <strong>Start</strong> &gt; <strong>Show recently added apps</strong></td>
 </tr>
 <tr class="odd">
 <td align="left">Pinned folders</td>
-<td align="left"></td>
+<td align="left">not applicable</td>
 <td align="left"><strong>Settings</strong> &gt; <strong>Personalization</strong> &gt; <strong>Start</strong> &gt; <strong>Choose which folders appear on Start</strong></td>
 </tr>
 <tr class="even">
--- a/windows/manage/windows-store-for-business-overview.md
+++ b/windows/manage/windows-store-for-business-overview.md
@ -211,56 +211,162 @@ For more information, see [Manage settings in the Store for Business](../manage/

 ## Supported markets

-
 Store for Business is currently available in these markets.

-|Country or locale|Paid apps|Free apps|
-|-----------------|---------|---------|
-|Argentina|X|X|
-|Australia|X|X|
-|Austria|X|X|
-|Belgium (Dutch, French)|X|X|
-|Brazil| |X|
-|Canada (English, French)|X|X|
-|Chile|X|X|
-|Columbia|X|X|
-|Croatia|X|X|
-|Czech Republic|X|X|
-|Denmark|X|X|
-|Finland|X|X|
-|France|X|X|
-|Germany|X|X|
-|Greece|X|X|
-|Hong Kong SAR|X|X|
-|Hungary|X|X|
-|India| |X|
-|Indonesia|X|X|
-|Ireland|X|X|
-|Italy|X|X|
-|Japan|X|X|
-|Malaysia|X|X|
-|Mexico|X|X|
-|Netherlands|X|X|
-|New Zealand|X|X|
-|Norway|X|X|
-|Philippines|X|X|
-|Poland|X|X|
-|Portugal|X|X|
-|Romania|X|X|
-|Russia| |X|
-|Singapore|X|X|
-|Slovakia|X|X|
-|South Africa|X|X|
-|Spain|X|X|
-|Sweden|X|X|
-|Switzerland (French, German)|X|X|
-|Taiwan| |X|
-|Thailand|X|X|
-|Turkey|X|X|
-|Ukraine| |X|
-|United Kingdom|X|X|
-|United States|X|X|
-|Vietnam|X|X|
+<table>
+   <tr>
+        <th align="center" colspan="4">Support for free and paid apps</th>
+   </tr>
+   <tr align="left">
+     <td>
+        <ul>
+            <li>Algeria</li>
+            <li>Angola</li>
+            <li>Argentina</li>
+            <li>Australia</li>
+            <li>Austria</li>
+            <li>Bahamas</li>
+            <li>Bahrain</li>
+            <li>Bangladesh</li>
+            <li>Barbados</li>
+            <li>Belgium</li>
+            <li>Belize</li>
+            <li>Bermuda</li>
+            <li>Bolivia</li>
+            <li>Botswana</li>
+            <li>Brunei Darussalam</li>
+            <li>Bulgaria</li>
+            <li>Cameroon</li>
+            <li>Canada</li>
+            <li>Republic of Cabo Verde</li>
+            <li>Cayman Islands</li>
+            <li>Chile</li>
+            <li>Colombia</li>
+            <li>Costa Rica</li>
+            <li>C&ocirc;te D'ivoire</li>
+            <li>Croatia</li>
+            <li>Cur&ccedil;ao</li>
+            <li>Cyprus</li>
+            <li>Czech Republic</li>
+            <li>Denmark</li>
+        </ul>
+    </td>
+     <td>
+        <ul>
+            <li>Dominican Republic</li>
+            <li>Ecuador</li>
+            <li>Egypt</li>
+            <li>El Salvador</li>
+            <li>Estonia</li>
+            <li>Faroe Islands</li>
+            <li>Fiji</li>
+            <li>Finland</li>
+            <li>France</li>
+            <li>Germany</li>
+            <li>Ghana</li>
+            <li>Greece</li>
+            <li>Guatemala</li>
+            <li>Honduras</li>
+            <li>Hong Kong SAR</li>
+            <li>Hungary</li>
+            <li>Iceland</li>
+            <li>Indonesia</li>
+            <li>Iraq</li>
+            <li>Ireland</li>
+            <li>Israel</li>
+            <li>Italy</li>
+            <li>Jamaica</li>
+            <li>Japan</li>
+            <li>Jordan</li>
+            <li>Kenya</li>
+            <li>Kuwait</li>
+            <li>Latvia</li>
+            <li>Lebanon</li>
+        </ul>
+    </td>
+    <td>
+        <ul>
+            <li>Libya</li>
+            <li>Liechtenstein</li>
+            <li>Lithuania</li>
+            <li>Luxembourg</li>
+            <li>Malaysia</li>
+            <li>Malta</li>
+            <li>Mexico</li>
+            <li>Mongolia</li>
+            <li>Montenegro</li>
+            <li>Morocco</li>
+            <li>Namibia</li>
+            <li>Netherlands</li>
+            <li>New Zealand</li>
+            <li>Nicaragua</li>
+            <li>Nigeria</li>
+            <li>Norway</li>
+            <li>Oman</li>
+            <li>Pakistan</li>
+            <li>Palestinian Authority</li>
+            <li>Panama</li>
+            <li>Paraguay</li>
+            <li>Peru</li>
+            <li>Philippines</li>
+            <li>Poland</li>
+            <li>Portugal</li>
+            <li>Puerto Rico</li>
+            <li>Qatar</li>
+            <li>Romania</li>
+            <li>Rwanda</li>
+        </ul>
+    </td>
+    <td>
+        <ul>
+            <li>Saint Kitts and Nevis</li>
+            <li>Saudi Arabia</li>
+            <li>Senegal</li>
+            <li>Serbia</li>
+            <li>Singapore</li>
+            <li>Slovakia</li>
+            <li>Slovenia</li>
+            <li>South Africa</li>
+            <li>Spain</li>
+            <li>Sweden</li>
+            <li>Switzerland</li>
+            <li>Tanzania</li>
+            <li>Thailand</li>
+            <li>Trinidad and Tobago</li>
+            <li>Tunisia</li>
+            <li>Turkey</li>
+            <li>Uganda</li>
+            <li>United Arab Emirates</li>
+            <li>United Kingdom</li>
+            <li>United States</li>
+            <li>Uruguay</li>
+            <li>Viet Nam</li>
+            <li>Virgin Islands, U.S.</li>
+            <li>Zambia</li>
+            <li>Zimbabwe<br>&nbsp;<br>&nbsp;<br>&nbsp;<br>&nbsp;</li>
+            
+        </ul>
+    </td>
+   </tr>
+</table>
+
+<table>
+   <tr>
+        <th align="center">Support for free apps only</th>
+   </tr>
+   <tr align="left">
+     <td>
+        <ul>
+            <li>Brazil</li>
+            <li>India</li>
+            <li>Russia</li>
+            <li>Taiwan</li>
+            <li>Ukraine</li>
+        </ul>
+    </td>
+   </tr>
+</table>
+
  
 ## <a href="" id="isv-wsfb"></a>ISVs and the Store for Business

--- a/windows/manage/working-with-line-of-business-apps.md
+++ b/windows/manage/working-with-line-of-business-apps.md
@ -12,7 +12,6 @@ localizationpriority: high

 # Working with line-of-business apps

-
 **Applies to**

 -   Windows 10