resolving merge conflict

windows/TOC.md

@@ -2,5 +2,7 @@
 ## [What's new in Windows 10](whats-new/index.md)
 ## [Plan for Windows 10 deployment](plan/index.md)
 ## [Deploy Windows 10](deploy/index.md)
+## [Configure Windows 10](configure/index.md)
+## [Update Windows 10](update/index.md)
 ## [Keep Windows 10 secure](keep-secure/index.md)
-## [Manage and update Windows 10](manage/index.md)
+## [Manage Windows 10](manage/index.md)

windows/breadcrumb/toc.yml

@@ -11,6 +11,12 @@
   - name: Deploy
     tocHref: /itpro/windows/deploy/
     topicHref: /itpro/windows/deploy/index
+  - name: Configure
+    tocHref: /itpro/windows/configure/
+    topicHref: /itpro/windows/configure/index
+  - name: Update
+    tocHref: /itpro/windows/update/
+    topicHref: /itpro/windows/update/index
   - name: Keep secure
     tocHref: /itpro/windows/keep-secure/
     topicHref: /itpro/windows/keep-secure/index

windows/configure/TOC.md

@@ -0,0 +1,59 @@
+# [Configure Windows 10](index.md)
+## [Configure Windows telemetry in your organization](configure-windows-telemetry-in-your-organization.md)
+## [Manage connections from Windows operating system components to Microsoft services](manage-connections-from-windows-operating-system-components-to-microsoft-services.md)
+## [Manage Wi-Fi Sense in your company](manage-wifi-sense-in-enterprise.md)
+## [Configure kiosk and shared devices running Windows 10 desktop editions](kiosk-shared-pc.md)
+### [Set up a shared or guest PC with Windows 10](set-up-a-device-for-anyone-to-use.md)
+### [Set up a kiosk on Windows 10 Pro, Enterprise, or Education](set-up-a-kiosk-for-windows-10-for-desktop-editions.md)
+### [Guidelines for choosing an app for assigned access (kiosk mode)](guidelines-for-assigned-access-app.md)
+### [Lock down Windows 10 to specific apps (AppLocker)](lock-down-windows-10-to-specific-apps.md)
+## [Configure Windows 10 Mobile devices](configure-mobile.md)
+### [Set up a kiosk on Windows 10 Mobile or Windows 10 Mobile Enterprise](set-up-a-kiosk-for-windows-10-for-mobile-edition.md)
+### [Use Windows Configuration Designer to configure Windows 10 Mobile devices](provisioning-configure-mobile.md)
+### [Use the Lockdown Designer app to configure Windows 10 Mobile devices](mobile-lockdown-designer.md)
+### [Configure Windows 10 Mobile using Lockdown XML](lockdown-xml.md)
+### [Settings and quick actions that can be locked down in Windows 10 Mobile](settings-that-can-be-locked-down.md)
+### [Product IDs in Windows 10 Mobile](product-ids-in-windows-10-mobile.md)
+## [Configure Start, taskbar, and lock screen](start-taskbar-lockscreen.md)
+### [Windows Spotlight on the lock screen](windows-spotlight.md)
+### [Manage Windows 10 and Windows Store tips, tricks, and suggestions](manage-tips-and-suggestions.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)
+#### [Changes to Start policies in Windows 10](changes-to-start-policies-in-windows-10.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 - Review a reminder suggested by Cortana based on what you’ve promised in email}(cortana-at-work-scenario-6.md)
+#### [Test scenario 7 - Use Cortana and Windows Information Protection (WIP) to help protect your organization’s data on a device](cortana-at-work-scenario-7.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)
+## [Configure access to Windows Store](stop-employees-from-using-the-windows-store.md)
+## [Provisioning packages for Windows 10](provisioning-packages.md)
+### [How provisioning works in Windows 10](provisioning-how-it-works.md)
+### [Introduction to configuration service providers (CSPs)](how-it-pros-can-use-configuration-service-providers.md)
+### [Install Windows Imaging and Configuration Designer](provisioning-install-icd.md)
+### [Create a provisioning package](provisioning-create-package.md)
+### [Apply a provisioning package](provisioning-apply-package.md)
+### [Settings changed when you uninstall a provisioning package](provisioning-uninstall-package.md)
+### [Provision PCs with common settings for initial deployment (simple provisioning)](provision-pcs-for-initial-deployment.md)
+### [Provision PCs with apps and certificates for initial deployments (advanced provisioning)](provision-pcs-with-apps-and-certificates.md)
+### [Use a script to install a desktop app in provisioning packages](provisioning-script-to-install-app.md)
+### [NFC-based device provisioning](provisioning-nfc.md)
+### [Windows ICD command-line interface (reference)](provisioning-command-line.md)
+### [Create a provisioning package with multivariant settings](provisioning-multivariant.md)
+## [Lockdown features from Windows Embedded 8.1 Industry](lockdown-features-windows-10.md)
+## [Change history for Configure Windows 10](change-history-for-configure-windows-10.md)

windows/configure/change-history-for-configure-windows-10.md

@@ -0,0 +1,20 @@
+---
+title: Change history for Configure Windows 10 (Windows 10)
+description: This topic lists changes to documentation for configuring Windows 10.
+keywords: 
+ms.prod: w10
+ms.mktglfcycl: manage
+ms.sitesec: library
+ms.pagetype: security
+localizationpriority: high
+author: jdeckerMS
+---
+
+# Change history for Configure Windows 10
+
+This topic lists new and updated topics in the [Configure Windows 10](index.md) documentation for [Windows 10 and Windows 10 Mobile](../index.md).
+
+
+## RELEASE: Windows 10, version 1703
+
+The topics in this library have been updated for Windows 10, version 1703 (also known as the Creators Update).

windows/configure/changes-to-start-policies-in-windows-10.md

@@ -145,27 +145,6 @@ The Start policy settings listed below do not work on Windows 10. Most of them
 
  
 
-## Related topics
-
-
-[Manage corporate devices](manage-corporate-devices.md)
-
-[New policies for Windows 10](new-policies-for-windows-10.md)
-
-[Manage Windows 10 Start layout options](windows-10-start-layout-options-and-policies.md)
-
-[Customize and export Start layout](customize-and-export-start-layout.md)
-
-[Customize Windows 10 Start screens with Group Policy](customize-windows-10-start-screens-by-using-group-policy.md)
-
-[Customize Windows 10 Start screens with mobile device management (MDM)](customize-windows-10-start-screens-by-using-mobile-device-management.md)
-
-[Customize Windows 10 Start screens with ICD and provisioning packages](customize-windows-10-start-screens-by-using-provisioning-packages-and-icd.md)
-
- 
-
- 
-
 
 
 

windows/configure/configure-mobile.md

@@ -0,0 +1,14 @@
+---
+title: configure mobile
+description: 
+keywords: Windows 10, MDM, WSUS, Windows update
+ms.prod: w10
+ms.mktglfcycl: manage
+ms.sitesec: library
+ms.pagetype: security
+localizationpriority: high
+author: jdeckerMS
+---
+
+# configure mobile
+

windows/configure/cortana-at-work-crm.md

@@ -4,6 +4,7 @@ description: How to set up Cortana to help your salespeople get proactive insigh
 ms.prod: w10
 ms.mktglfcycl: manage
 ms.sitesec: library
+author: eross-msft
 localizationpriority: high
 ---
 

windows/configure/cortana-at-work-feedback.md

@@ -4,6 +4,7 @@ description: How to send feedback to Microsoft about Cortana at work.
 ms.prod: w10
 ms.mktglfcycl: manage
 ms.sitesec: library
+author: eross-msft
 localizationpriority: high
 ---
 

windows/configure/cortana-at-work-o365.md

@@ -4,6 +4,7 @@ description: How to connect Cortana to Office 365 so your employees are notified
 ms.prod: w10
 ms.mktglfcycl: manage
 ms.sitesec: library
+author: eross-msft
 localizationpriority: high
 ---
 

windows/configure/cortana-at-work-overview.md

@@ -4,6 +4,7 @@ description: The world’s first personal digital assistant helps users get thin
 ms.prod: w10
 ms.mktglfcycl: manage
 ms.sitesec: library
+author: eross-msft
 localizationpriority: high
 ---
 

windows/configure/cortana-at-work-policy-settings.md

@@ -4,6 +4,7 @@ description: The list of Group Policy and mobile device management (MDM) policy
 ms.prod: w10
 ms.mktglfcycl: manage
 ms.sitesec: library
+author: eross-msft
 localizationpriority: high
 ---
 

windows/configure/cortana-at-work-powerbi.md

@@ -4,6 +4,7 @@ description: How to integrate Cortana with Power BI to help your employees get a
 ms.prod: w10
 ms.mktglfcycl: manage
 ms.sitesec: library
+author: eross-msft
 localizationpriority: high
 ---
 

windows/configure/cortana-at-work-scenario-1.md

@@ -4,6 +4,7 @@ description: A test scenario walking you through signing in and managing the not
 ms.prod: w10
 ms.mktglfcycl: manage
 ms.sitesec: library
+author: eross-msft
 localizationpriority: high
 ---
 

windows/configure/cortana-at-work-scenario-2.md

@@ -4,6 +4,7 @@ description: A test scenario about how to perform a quick search with Cortana at
 ms.prod: w10
 ms.mktglfcycl: manage
 ms.sitesec: library
+author: eross-msft
 localizationpriority: high
 ---
 

windows/configure/cortana-at-work-scenario-3.md

@@ -4,6 +4,7 @@ description: A test scenario about how to set a location-based reminder using Co
 ms.prod: w10
 ms.mktglfcycl: manage
 ms.sitesec: library
+author: eross-msft
 localizationpriority: high
 ---
 

windows/configure/cortana-at-work-scenario-4.md

@@ -4,6 +4,7 @@ description: A test scenario about how to use Cortana at work to find your upcom
 ms.prod: w10
 ms.mktglfcycl: manage
 ms.sitesec: library
+author: eross-msft
 localizationpriority: high
 ---
 

windows/configure/cortana-at-work-scenario-5.md

@@ -4,6 +4,7 @@ description: A test scenario about how to use Cortana at work to send email to a
 ms.prod: w10
 ms.mktglfcycl: manage
 ms.sitesec: library
+author: eross-msft
 localizationpriority: high
 ---
 

windows/configure/cortana-at-work-scenario-7.md

@@ -0,0 +1,38 @@
+---
+title: Test scenario 7 - 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
+author: eross-msft
+localizationpriority: high
+---
+
+# Test scenario 7 - 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.

windows/configure/cortana-at-work-testing-scenarios.md

@@ -4,6 +4,7 @@ description: A list of suggested testing scenarios that you can use to test Cort
 ms.prod: w10
 ms.mktglfcycl: manage
 ms.sitesec: library
+author: eross-msft
 localizationpriority: high
 ---
 

windows/configure/cortana-at-work-voice-commands.md

@@ -4,6 +4,7 @@ description: How to create voice commands that use Cortana to perform voice-enab
 ms.prod: w10
 ms.mktglfcycl: manage
 ms.sitesec: library
+author: eross-msft
 localizationpriority: high
 ---
 

windows/configure/how-it-pros-can-use-configuration-service-providers.md

@@ -58,7 +58,7 @@ Generally, enterprises rely on Group Policy or MDM to configure and manage devic
 
 In addition, you may have unmanaged devices, or a large number of devices that you want to configure before enrolling them in management, or you want to apply custom settings that aren't available through your MDM service. The [CSP documentation](#bkmk-csp-doc) can help you understand the settings that can be configured or queried.
 
-In addition, some of the topics in the [Windows 10 and Windows 10 Mobile](../index.md) library on Technet include links to applicable CSP reference topics, such as [Cortana integration in your business or enterprise](manage-cortana-in-enterprise.md) which links to the [Policy CSP](https://go.microsoft.com/fwlink/p/?LinkID=623244). In the CSP topics, you can learn about all of the available configuration settings.
+In addition, some of the topics in the [Windows 10 and Windows 10 Mobile](../index.md) library on Technet include links to applicable CSP reference topics, such as [Cortana integration in your business or enterprise](cortana-at-work-overview.md) which links to the [Policy CSP](https://go.microsoft.com/fwlink/p/?LinkID=623244). In the CSP topics, you can learn about all of the available configuration settings.
 
 ### CSPs in Windows Imaging and Configuration Designer (ICD)
 
@@ -68,7 +68,7 @@ Many settings in Windows ICD will display documentation for that setting in the
 
 ![how help content appears in icd](images/cspinicd.png)
 
-[Configure devices without MDM](configure-devices-without-mdm.md) explains how to use the Windows ICD tool included in the Windows Assessment and Deployment Kit (ADK) for Windows 10 to create a runtime provisioning package.
+[Configure devices without MDM](../manage/configure-devices-without-mdm.md) explains how to use the Windows ICD tool included in the Windows Assessment and Deployment Kit (ADK) for Windows 10 to create a runtime provisioning package.
 
 ### CSPs in MDM
 
@@ -214,19 +214,6 @@ Here is a list of CSPs supported on Windows 10 Enterprise, Windows 10 Mobile E
 -   [WindowsLicensing CSP](https://go.microsoft.com/fwlink/p/?LinkId=723274)
 -   [WindowsSecurityAuditing CSP](https://go.microsoft.com/fwlink/p/?LinkId=723415)
 
-## Related topics
-
-[What's new in MDM enrollment and management in Windows 10, version 1607](https://msdn.microsoft.com/library/windows/hardware/mt299056.aspx#whatsnew_1607)
-
-[Lock down Windows 10](lock-down-windows-10.md)
-
-[Manage corporate devices](manage-corporate-devices.md)
-
-[New policies for Windows 10](new-policies-for-windows-10.md)
-
-[Windows 10 Mobile and MDM](windows-10-mobile-and-mdm.md)
-
-[Changes to Group Policy settings for Start in Windows 10](changes-to-start-policies-in-windows-10.md)