- **Desktop:** Windows 10, version 1703
- **Mobile:** Windows 10 Mobile, version 1703 (with limited functionality)
|
-|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.For example:
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.
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)](/windows/threat-protection/windows-information-protection/protect-enterprise-data-using-wip)
If you decide to use WIP, you must also have a management solution. This can be Microsoft Intune, Microsoft Endpoint Configuration Manager (version 1606 or later), or your current company-wide 3rd party mobile device management (MDM) solution.|
+|**Software** |**Minimum version** |
+|---------|---------|
+|Client operating system | Desktop:
- Windows 10, version 2004 (recommended)
- Windows 10, version 1703 (legacy version of Cortana)
Mobile: Windows 10 mobile, version 1703 (legacy version of Cortana)
For more information on the differences between Cortana in Windows 10, version 2004 and earlier versions, see [**How is my data processed by Cortana**](https://docs.microsoft.com/windows/configuration/cortana-at-work/cortana-at-work-overview#how-is-my-data-processed-by-cortana) below. |
+|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. For example, if you turn **Speech** off, your employees won't be able to use the wake word (“Cortana”) for hands-free activation or voice commands to easily ask for help. |
## 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](https://windows.microsoft.com/windows-10/cortana-privacy-faq) topic.
+Your organization must have an Azure AD tenant and your employees' devices must all be Azure AD-joined for the best Cortana experience. (Users may also sign into Cortana with a Microsoft account, but will not be able to use their enterprise email or calendar.) For info about what an Azure AD tenant is, how to get your devices joined, and other Azure AD maintenance info, see [Azure Active Directory documentation.](https://docs.microsoft.com/azure/active-directory/)
+
+## How is my data processed by Cortana?
+
+Cortana's approach to integration with Microsoft 365 has changed with Windows 10, version 2004 and later.
+
+### Cortana in Windows 10, version 2004 and later
+
+Cortana enterprise services that can be accessed using Azure AD through Cortana in Windows 10, version 2004 and later, meet the same enterprise-level privacy, security, and compliance promises as reflected in the [Online Services Terms (OST)](https://www.microsoft.com/en-us/licensing/product-licensing/products). To learn more, see [Cortana in Microsoft 365](https://docs.microsoft.com/microsoft-365/admin/misc/cortana-integration?view=o365-worldwide#what-data-is-processed-by-cortana-in-office-365).
+
+#### How does Microsoft store, retain, process, and use Customer Data in Cortana?
+
+The table below describes the data handling for Cortana enterprise services.
+
+
+|**Name** |**Description** |
+|---------|---------|
+|**Storage** |Customer Data is stored on Microsoft servers inside the Office 365 cloud. Your data is part of your tenant. Speech audio is not retained. |
+|**Stays in Geo** |Customer Data is stored on Microsoft servers inside the Office 365 cloud in Geo. Your data is part of your tenant. |
+|**Retention** |Customer Data is deleted when the account is closed by the tenant administrator or when a GDPR Data Subject Rights deletion request is made. Speech audio is not retained. |
+|**Processing and confidentiality** |Personnel engaged in the processing of Customer Data and personal data (i) will process such data only on instructions from Customer, and (ii) will be obligated to maintain the confidentiality and security of such data even after their engagement ends. |
+|**Usage** |Microsoft uses Customer Data only to provide the services agreed upon, and for purposes that are compatible with those services. Machine learning to develop and improve models is one of those purposes. Machine learning is done inside the Office 365 cloud consistent with the Online Services Terms. Your data is not used to target advertising. |
+
+#### How does the wake word (Cortana) work? If I enable it, is Cortana always listening?
+
+>[!NOTE]
+>The wake word has been temporarily disabled in the latest version of Cortana in Windows but will be restored soon. You can still click on the microphone button to use your voice with Cortana.
+
+Cortana only begins listening for commands or queries when the wake word is detected, or the microphone button has been selected.
+
+First, the user must enable the wake word from within Cortana settings. Once it has been enabled, a component of Windows called the [Windows Multiple Voice Assistant platform](https://docs.microsoft.com/windows-hardware/drivers/audio/voice-activation-mva#voice-activation) will start listening for the wake word. No audio is processed by speech recognition unless two local wake word detectors and a server-side one agree with high confidence that the wake word was heard.
+
+The first decision is made by the Windows Multiple Voice Assistant platform leveraging hardware optionally included in the user's PC for power savings. If the wake word is detected, Windows will show a microphone icon in the system tray indicating an assistant app is listening.
+
+:::image type="content" source="../screenshot2.png" alt-text="Screenshot: Microphone icon in the system tray indicating an assistant app is listening":::
+
+At that point, the Cortana app will receive the audio, run a second, more accurate wake word detector, and optionally send it to a Microsoft cloud service where a third wake word detector will confirm. If the service does not confirm that the activation was valid, the audio will be discarded and deleted from any further processing or server logs. On the user's PC, the Cortana app will be silently dismissed, and no query will be shown in conversation history because the query was discarded.
+
+If all three wake word detectors agree, the Cortana canvas will show what speech has been recognized.
+
+### Cortana in Windows 10, versions 1909 and earlier
+
+Cortana in Windows 10, versions 1909 and earlier, isn't a service covered by the Office 365 Trust Center. [Learn more about how Cortana in Windows 10, version 1909 and earlier, treats your data](https://go.microsoft.com/fwlink/p/?LinkId=536419).
Cortana is covered under the [Microsoft Privacy Statement](https://privacy.microsoft.com/privacystatement) and [Microsoft Services Agreement](https://www.microsoft.com/servicesagreement).
## See also
+
- [What is Cortana?](https://go.microsoft.com/fwlink/p/?LinkId=746818)
-
-- [Known issues for Windows Desktop Search and Cortana in Windows 10](https://support.microsoft.com/help/3206883/known-issues-for-windows-desktop-search-and-cortana-in-windows-10)
-
-- [Cortana for developers](https://go.microsoft.com/fwlink/?LinkId=717385)
diff --git a/windows/configuration/cortana-at-work/cortana-at-work-policy-settings.md b/windows/configuration/cortana-at-work/cortana-at-work-policy-settings.md
index 0122fb2eb7..1729809a44 100644
--- a/windows/configuration/cortana-at-work/cortana-at-work-policy-settings.md
+++ b/windows/configuration/cortana-at-work/cortana-at-work-policy-settings.md
@@ -13,34 +13,40 @@ manager: dansimp
---
# Use Group Policy and mobile device management (MDM) settings to configure Cortana in your organization
-**Applies to:**
-
-- Windows 10
-- Windows 10 Mobile
>[!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](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).
-
-|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.
**Note**
This setting only applies to Windows 10 for desktop devices. |
-|Computer Configuration\Administrative Templates\Control Panel\Regional and Language Options\Allow users to enable online speech recognition services|Privacy/AllowInputPersonalization|Specifies whether an employee can use voice commands with Cortana in your organization.
**In Windows 10, version 1511**
Cortana won’t work if this setting is turned off (disabled).
**In Windows 10, version 1607 and later**
Cortana still works if this setting is turned off (disabled).|
-|None|System/AllowLocation|Specifies whether to allow app access to the Location service.
**In Windows 10, version 1511**
Cortana won’t work if this setting is turned off (disabled).
**In Windows 10, version 1607 and later**
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.
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.
**Note**
This setting only applies to Windows 10 Mobile. Other versions of Windows should use Don't search the web or display web results. |
-|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.
**In Windows 10 Pro edition**
This setting can’t be managed.
**In Windows 10 Enterprise edition**
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.
**Important**
Cortana won’t work if this setting is turned off (disabled). However, employees can still perform local searches even with Cortana turned off.|
-
-
-
-
-
-
-
-
-
-
+>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://docs.microsoft.com/windows/client-management/mdm/policy-configuration-service-provider) topic, located in the configuration service provider reference topics.
+|**Group policy** |**MDM policy** |**Description** |
+|---------|---------|---------|
+|Computer Configuration\Administrative Templates\Windows Components\Search\Allow Cortana |Experience/AllowCortana |Specifies whether employees can use Cortana.
+> [!IMPORTANT]
+> Cortana won’t work if this setting is turned off (disabled). However, on Windows 10, version 1809 and below, employees can still perform local searches even with Cortana turned off. |
+|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.
+> [!NOTE]
+> Cortana in Windows 10, versions 2004 and later do not currently support Above Lock. |
+|Computer Configuration\Administrative Templates\Windows Components\App Privacy\LetAppsActivateWithVoice |[Privacy/LetAppsActivateWithVoice](https://docs.microsoft.com/windows/client-management/mdm/policy-csp-privacy#privacy-letappsactivatewithvoice) |Specifies whether apps (such as Cortana or other voice assistants) can activate using a wake word (e.g. “Hey Cortana”).
+> [!NOTE]
+> This setting only applies to Windows 10 versions 2004 and later. To disable wake word activation on Windows 10 versions 1909 and earlier, you will need to disable voice commands using Privacy/AllowInputPersonalization. |
+|Computer Configuration\Administrative Templates\Windows Components\App Privacy\LetAppsAccessMicrophone |[Privacy/LetAppsAccessMicrophone_ForceDenyTheseApps](https://docs.microsoft.com/windows/client-management/mdm/policy-csp-privacy#privacy-letappsaccessmicrophone-forcedenytheseapps) | Use this to disable Cortana’s access to the microphone. To do so, specify Cortana’s Package Family Name: Microsoft.549981C3F5F10_8wekyb3d8bbwe
+Users will still be able to type queries to Cortana. |
+|Computer Configuration\Administrative Templates\Control Panel\Regional and Language Options\Allow users to enable online speech recognition services |Privacy/AllowInputPersonalization |Specifies whether an employee can use voice commands with Cortana in your organization.
+**In Windows 10, version 1511**
Cortana won’t work if this setting is turned off (disabled).
**In Windows 10, version 1607 and later**
Non-speech aspects of Cortana will still work if this setting is turned off (disabled).
**In Windows 10, version 2004 and later**
Cortana will work, but voice input will be disabled. |
+|None |System/AllowLocation |Specifies whether to allow app access to the Location service.
+**In Windows 10, version 1511**
Cortana won’t work if this setting is turned off (disabled).
+**In Windows 10, version 1607 and later**
+Cortana still works if this setting is turned off (disabled).
+**In Windows 10, version 2004 and later**
+Cortana still works if this setting is turned off (disabled). Cortana in Windows 10, versions 2004 and later do not currently use the Location service. |
+|None |Accounts/AllowMicrosoftAccountConnection |Specifies whether to allow employees to sign in using a Microsoft account (MSA) from Windows apps.
+Disable this setting if you only want to allow users to sign in with their Azure AD account. |
+|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.
+**In Windows 10, version 2004 and later**
Cortana still works if this setting is turned off (disabled). Cortana in Windows 10, versions 2004 and later, do not currently use the Location service. |
+|Computer Configuration\Administrative Templates\Windows Components\Search\Don't search the web or display web results |Search/DoNotUseWebResults |Specifies whether search can perform queries on the web and if the web results are displayed in search.
+**In Windows 10 Pro edition**
This setting can’t be managed.
+**In Windows 10 Enterprise edition**
Cortana won't work if this setting is turned off (disabled).
+**In Windows 10, version 2004 and later**
This setting no longer affects Cortana. |
+|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.
+> [!NOTE]
+> This setting only applies to Windows 10 Mobile. Other versions of Windows should use Don't search the web or display web results. |
\ No newline at end of file
diff --git a/windows/configuration/cortana-at-work/cortana-at-work-powerbi.md b/windows/configuration/cortana-at-work/cortana-at-work-powerbi.md
index 1239cdfc7a..6bf6aaf7bd 100644
--- a/windows/configuration/cortana-at-work/cortana-at-work-powerbi.md
+++ b/windows/configuration/cortana-at-work/cortana-at-work-powerbi.md
@@ -13,10 +13,6 @@ manager: dansimp
---
# Set up and test Cortana for Power BI in your organization
-**Applies to:**
-
-- Windows 10, version 1703
-- Windows 10 Mobile, version 1703
>[!IMPORTANT]
>Cortana for Power BI is deprecated and will not be available in future releases. This topic is provided as a reference for previous versions only.
diff --git a/windows/configuration/cortana-at-work/cortana-at-work-scenario-1.md b/windows/configuration/cortana-at-work/cortana-at-work-scenario-1.md
index a7b6e72c12..de5e546244 100644
--- a/windows/configuration/cortana-at-work/cortana-at-work-scenario-1.md
+++ b/windows/configuration/cortana-at-work/cortana-at-work-scenario-1.md
@@ -12,49 +12,24 @@ ms.reviewer:
manager: dansimp
---
-# Test scenario 1 - Sign-in to Azure AD and use Cortana to manage the notebook
+# Test scenario 1 – Sign into Azure AD, enable the wake word, and try a voice query
-- Windows 10, version 1703
-- Windows 10 Mobile, version 1703
+>[!NOTE]
+>The wake word has been temporarily disabled in the latest version of Cortana in Windows but will be restored soon.
->[!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.
+1. Select the **Cortana** icon in the task bar and sign in using your Azure AD account.
-This scenario turns on Azure AD and let's your employee use Cortana to manage an entry in the notebook.
+2. Select the "…" menu and select **Talking to Cortana**.
-## Turn on Azure AD
-This process helps you to sign out of a Microsoft Account and to sign into an Azure AD account.
+3. Toggle **Wake word** to **On** and close Cortana.
-1. Click on the **Cortana** icon in the taskbar, click the **Notebook**, and then click **About Me**.
+4. Say **Cortana, what can you do?**.
-2. Click your email address.
+When you say **Cortana**, Cortana will open in listening mode to acknowledge the wake word.
- A dialog box appears, showing the associated account info.
+:::image type="content" source="../screenshot4.png" alt-text="Screenshot: Cortana listening mode":::
-3. Click your email address again, and then click **Sign out**.
+Once you finish saying your query, Cortana will open with the result.
- 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**.
-
- 
-
-4. Click on the **Home** icon and scroll to the weather forecast for Redmond, Washington.
-
- 
+>[!NOTE]
+>If you've disabled the wake word using MDM or Group Policy, you will need to manually activate the microphone by selecting Cortana, then the mic button.
\ No newline at end of file
diff --git a/windows/configuration/cortana-at-work/cortana-at-work-scenario-2.md b/windows/configuration/cortana-at-work/cortana-at-work-scenario-2.md
index c58d165771..cd8da63e37 100644
--- a/windows/configuration/cortana-at-work/cortana-at-work-scenario-2.md
+++ b/windows/configuration/cortana-at-work/cortana-at-work-scenario-2.md
@@ -12,32 +12,15 @@ ms.reviewer:
manager: dansimp
---
-# Test scenario 2 - Perform a quick search with Cortana at work
+# Test scenario 2 – Perform a Bing search with Cortana
-- Windows 10, version 1703
-- Windows 10 Mobile, version 1703
+1. Select the **Cortana** icon in the taskbar.
->[!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.
+2. Type **What time is it in Hyderabad?**.
-This scenario helps you perform a quick search using Cortana, both by typing and through voice commands.
+Cortana will respond with the information from Bing.
-## Search using Cortana
-This process helps you use Cortana at work to perform a quick search.
+:::image type="content" source="../screenshot5.png" alt-text="Screenshot: Cortana showing current time in Hyderbad":::
-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.
-
- 
-
-## 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.
-
- 
+>[!NOTE]
+>This scenario requires Bing Answers to be enabled. To learn more, see [Set up and configure the Bing Answers feature](https://docs.microsoft.com/windows/configuration/cortana-at-work/set-up-and-test-cortana-in-windows-10#set-up-and-configure-the-bing-answers-feature).
\ No newline at end of file
diff --git a/windows/configuration/cortana-at-work/cortana-at-work-scenario-3.md b/windows/configuration/cortana-at-work/cortana-at-work-scenario-3.md
index d072cdb5fa..5382e5665c 100644
--- a/windows/configuration/cortana-at-work/cortana-at-work-scenario-3.md
+++ b/windows/configuration/cortana-at-work/cortana-at-work-scenario-3.md
@@ -12,77 +12,14 @@ ms.reviewer:
manager: dansimp
---
-# Test scenario 3 - Set a reminder for a specific location using Cortana at work
+# Test scenario 3 - Set a reminder
-- Windows 10, version 1703
-- Windows 10 Mobile, version 1703
+This scenario helps you set up, review, and edit a reminder. For example, you can remind yourself to send someone a link to a document after a meeting.
->[!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.
+1. Select the **Cortana** icon in the taskbar and type **Remind me to send a link to the deck at 3:05pm** and press **Enter**.
-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.
+Cortana will create a reminder in Microsoft To Do and will remind you at the appropriate time.
->[!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.
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.
+:::image type="content" source="../screenshot6.png" alt-text="Screenshot: Cortana set a reminder":::
-## 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**.
-
- 
-
-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.
-
- 
-
-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.
-
- 
-
-8. Review the reminder info, and then click **Remind**.
-
- The reminder is saved and ready to be triggered.
-
- 
-
-## 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.
-
- 
-
-3. Say _Yes_ so Cortana can save the reminder.
-
- 
-
-## 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**.
-
- 
-
-2. Click the pending reminder you want to edit.
-
- 
-
-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**.
+:::image type="content" source="../screenshot7.png" alt-text="Screenshot: Cortana showing reminder on page":::
\ No newline at end of file
diff --git a/windows/configuration/cortana-at-work/cortana-at-work-scenario-4.md b/windows/configuration/cortana-at-work/cortana-at-work-scenario-4.md
index 4ea208fcfd..1a34778608 100644
--- a/windows/configuration/cortana-at-work/cortana-at-work-scenario-4.md
+++ b/windows/configuration/cortana-at-work/cortana-at-work-scenario-4.md
@@ -12,42 +12,16 @@ ms.reviewer:
manager: dansimp
---
-# Test scenario 4 - Use Cortana at work to find your upcoming meetings
+# Test scenario 4 - Use Cortana to find free time on your calendar
-- Windows 10, version 1703
-- Windows 10 Mobile, version 1703
+This scenario helps you find out if a time slot is free on your calendar.
->[!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.
+1. Select the **Cortana** icon in the taskbar.
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.
-
- 
-
-## 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.
-
- 
+3. Type **Am I free at 3 PM tomorrow?**
+Cortana will respond with your availability for that time, as well as nearby meetings.
+:::image type="content" source="../screenshot8.png" alt-text="Screenshot: Cortana showing free time on a calendar":::
\ No newline at end of file
diff --git a/windows/configuration/cortana-at-work/cortana-at-work-scenario-5.md b/windows/configuration/cortana-at-work/cortana-at-work-scenario-5.md
index f5efc05577..6312ad8983 100644
--- a/windows/configuration/cortana-at-work/cortana-at-work-scenario-5.md
+++ b/windows/configuration/cortana-at-work/cortana-at-work-scenario-5.md
@@ -12,48 +12,14 @@ ms.reviewer:
manager: dansimp
---
-# Test scenario 5 - Use Cortana to send email to a co-worker
+# Test scenario 5 - Test scenario 5 – Find out about a person
-- Windows 10, version 1703
-- Windows 10 Mobile, version 1703
+Cortana can help you quickly look up information about someone or the org chart.
->[!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.
+1. Select the **Cortana** icon in the taskbar.
-This scenario helps you to send an email to a co-worker listed in your work address book, both manually and verbally.
+2. Type or select the mic and say, **Who is name of person in your organization's?**
-## 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.
+:::image type="content" source="../screenshot9.png" alt-text="Screenshot: Cortana showing name of person in your organization":::
-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 <contact_name>_.
-
- Where _<contact_name>_ 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**.
-
- 
-
-## 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 <contact_name>_.
-
- Where _<contact_name>_ 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**.
-
- 
-
-4. Say _Send it_.
-
- The email is sent.
-
- 
+Cortana will respond with information about the person. You can select the person to see more information about them in Microsoft Search.
\ No newline at end of file
diff --git a/windows/configuration/cortana-at-work/cortana-at-work-scenario-6.md b/windows/configuration/cortana-at-work/cortana-at-work-scenario-6.md
index f5ffb003b7..b2c7bdd9dd 100644
--- a/windows/configuration/cortana-at-work/cortana-at-work-scenario-6.md
+++ b/windows/configuration/cortana-at-work/cortana-at-work-scenario-6.md
@@ -12,38 +12,14 @@ ms.reviewer:
manager: dansimp
---
-# Test scenario 6 - Review a reminder suggested by Cortana based on what you’ve promised in email
+# Test scenario 6 – Change your language and perform a quick search with Cortana
-- Windows 10, version 1703
-- Windows 10 Mobile, version 1703
+Cortana can help employees in regions outside the US search for quick answers like currency conversions, time zone conversions, or weather in their location.
->[!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. For more info, see the [Microsoft Privacy Statement](https://privacy.microsoft.com/privacystatement) and the [Microsoft Services Agreement](https://www.microsoft.com/servicesagreement).
+1. Select the **Cortana** icon in the taskbar.
-Cortana automatically finds patterns in your email, suggesting reminders based things that you said you would do so you don’t forget about them. For example, Cortana recognizes that if you include the text, _I’ll get this to you by the end of the week_ in an email, you're making a commitment to provide something by a specific date. Cortana can now suggest that you be reminded about this event, letting you decide whether to keep it or to cancel it.
+2. Select the **…** menu, then select **Settings**, **Language**, then select **Español (España)**. You will be prompted to restart the app.
->[!NOTE]
->The Suggested reminders feature is currently only available in English (en-us).
-
-**To use Cortana to create Suggested reminders for you**
-
-1. Make sure that you've connected Cortana to Office 365. For the steps to connect, see [Set up and test Cortana with Office 365 in your organization](cortana-at-work-o365.md).
-
-2. Click on the **Cortana** search box in the taskbar, click the **Notebook** icon, and then click **Permissions**.
-
-3. Make sure the **Contacts, email, calendar, and communication history** option is turned on.
-
- 
-
-4. Click the **Notebook** icon again, click the **Suggested reminders** option, click to turn on the **All reminder suggestions cards** option, click the **Notify me when something I mentioned doing is coming up** box, and then click **Save**.
-
- 
-
-5. Create and send an email to yourself (so you can see the Suggested reminder), including the text, _I’ll finish this project by end of day today_.
-
-6. After you get the email, click on the Cortana **Home** icon, and scroll to today’s events.
-
- If the reminder has a specific date or time associated with it, like end of day, Cortana notifies you at the appropriate time and puts the reminder into the Action Center. Also from the Home screen, you can view the email where you made the promise, set aside time on your calendar, officially set the reminder, or mark the reminder as completed.
-
- 
+3. Once the app has restarted, type or say **Convierte 100 Euros a Dólares**.
+:::image type="content" source="../screenshot10.png" alt-text="Screenshot: Cortana showing a change your language and showing search results in Spanish":::
\ No newline at end of file
diff --git a/windows/configuration/cortana-at-work/cortana-at-work-scenario-7.md b/windows/configuration/cortana-at-work/cortana-at-work-scenario-7.md
index a00867e25b..c10a722ceb 100644
--- a/windows/configuration/cortana-at-work/cortana-at-work-scenario-7.md
+++ b/windows/configuration/cortana-at-work/cortana-at-work-scenario-7.md
@@ -14,9 +14,6 @@ manager: dansimp
# Test scenario 7 - Use Cortana and Windows Information Protection (WIP) to help protect your organization’s data on a device
-- Windows 10, version 1703
-- Windows 10 Mobile, version 1703
-
>[!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.
diff --git a/windows/configuration/cortana-at-work/cortana-at-work-testing-scenarios.md b/windows/configuration/cortana-at-work/cortana-at-work-testing-scenarios.md
index 936f8b5788..9ab3b96e22 100644
--- a/windows/configuration/cortana-at-work/cortana-at-work-testing-scenarios.md
+++ b/windows/configuration/cortana-at-work/cortana-at-work-testing-scenarios.md
@@ -13,26 +13,19 @@ manager: dansimp
---
# Testing scenarios using Cortana in your business or organization
-**Applies to:**
-
-- Windows 10, version 1703
-- Windows 10 Mobile, version 1703
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](cortana-at-work-scenario-1.md)
+- [Sign into Azure AD, enable the Cortana wake word, and try a voice query](cortana-at-work-scenario-1.md)
-- [Perform a quick search with Cortana at work](cortana-at-work-scenario-2.md)
+- [Perform a Bing search with Cortana](cortana-at-work-scenario-2.md)
-- [Set a reminder and have it remind you when you’ve reached a specific location](cortana-at-work-scenario-3.md)
+- [Set a reminder](cortana-at-work-scenario-3.md)
-- [Search for your upcoming meetings on your work calendar](cortana-at-work-scenario-4.md)
+- [Use Cortana to find free time on your calendar](cortana-at-work-scenario-4.md)
-- [Send an email to a co-worker from your work email app](cortana-at-work-scenario-5.md)
+- [Find out about a person](cortana-at-work-scenario-5.md)
-- [Review a reminder suggested by Cortana based on what you’ve promised in email](cortana-at-work-scenario-6.md)
+- [Change your language and perform a quick search with Cortana](cortana-at-work-scenario-6.md)
-- [Use Windows Information Protection (WIP) to secure content on a device and then try to manage your organization’s entries in the notebook](cortana-at-work-scenario-7.md)
-
->[!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.
+- [Use Windows Information Protection (WIP) to secure content on a device and then try to manage your organization’s entries in the notebook](cortana-at-work-scenario-7.md)
\ No newline at end of file
diff --git a/windows/configuration/cortana-at-work/cortana-at-work-voice-commands.md b/windows/configuration/cortana-at-work/cortana-at-work-voice-commands.md
index 9ae00ff891..1425bcd323 100644
--- a/windows/configuration/cortana-at-work/cortana-at-work-voice-commands.md
+++ b/windows/configuration/cortana-at-work/cortana-at-work-voice-commands.md
@@ -13,15 +13,11 @@ manager: dansimp
---
# Set up and test custom voice commands in Cortana for your organization
-**Applies to:**
-
-- Windows 10, version 1703
-- Windows 10 Mobile, version 1703
-
-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 [The Cortana Skills Kit](https://docs.microsoft.com/cortana/getstarted).
+>This content applies to Cortana in versions 1909 and earlier, but will not be available in future releases.
+
+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.
## 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.
diff --git a/windows/configuration/cortana-at-work/set-up-and-test-cortana-in-windows-10.md b/windows/configuration/cortana-at-work/set-up-and-test-cortana-in-windows-10.md
new file mode 100644
index 0000000000..14dfdcd3da
--- /dev/null
+++ b/windows/configuration/cortana-at-work/set-up-and-test-cortana-in-windows-10.md
@@ -0,0 +1,49 @@
+---
+title: Set up and test Cortana in Windows 10, version 2004 and later
+ms.reviewer:
+manager: dansimp
+description: 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
+author: kwekua
+ms.localizationpriority: medium
+ms.author: dansimp
+---
+
+# Set up and test Cortana in Windows 10, version 2004 and later
+
+## Before you begin
+
+- If your enterprise had previously disabled Cortana for your employees using the **Computer Configuration\Administrative Templates\Windows Components\Search\Allow Cortana** Group Policy or the **Experience\AllowCortana** MDM setting but want to enable it now that Cortana is part of Microsoft 365, you will need to re-enable it at least for Windows 10, version 2004 and later.
+- **Cortana is regularly updated through the Microsoft Store.** Beginning with Windows 10, version 2004, Cortana is an appx preinstalled with Windows and is regularly updated through the Microsoft Store. To receive the latest updates to Cortana, you will need to [enable updates through the Microsoft Store](https://docs.microsoft.com/windows/configuration/stop-employees-from-using-microsoft-store).
+
+## Set up and configure the Bing Answers feature
+Bing Answers provides fast, authoritative results to search queries based on search terms. When the Bing Answers feature is enabled, users will be able to ask Cortana web-related questions in the Cortana in Windows app, such as "What's the current weather?" or "Who is the president of the U.S.?," and get a response, based on public results from Bing.com.
+
+The above experience is powered by Microsoft Bing, and Cortana sends the user queries to Bing. The use of Microsoft Bing is governed by the [Microsoft Services Agreement](https://www.microsoft.com/servicesagreement) and [Privacy Statement](https://privacy.microsoft.com/en-US/privacystatement).
+
+## Configure the Bing Answers feature
+
+Admins can configure the Cortana in Windows Bing Answers feature for their organizations. As the admin, use the following steps to change the setting for Bing Answers at the tenant/security group level. This setting is enabled by default, so that all users who have Cortana enabled will be able to receive Bing Answers. By default, the Bing Answer feature will be available to your users.
+
+Users cannot enable or disable the Bing Answer feature individually. So, if you disable this feature at the tenant/security group level, no users in your organization or specific security group will be able to use Bing Answers in Cortana in Windows.
+
+Sign in to the [Office Configuration Admin tool](https://config.office.com/).
+
+Follow the steps [here](https://docs.microsoft.com/deployoffice/overview-office-cloud-policy-service#steps-for-creating-a-policy-configuration) to create this policy configuration. Once completed, the policy will look as shown below:
+
+:::image type="content" source="../screenshot3.png" alt-text="Screenshot: Bing policy example":::
+
+## How does Microsoft handle customer data for Bing Answers?
+
+When a user enters a search query (by speech or text), Cortana evaluates if the request is for any of our first-party compliant skills if enabled in a specific market, and does the following:
+
+1. If it is for any of the first-party compliant skills, the query is sent to that skill, and results/action are returned.
+
+2. If it is not for any of the first-party compliant skills, the query is sent to Bing for a search of public results from Bing.com. Because enterprise searches might be sensitive, similar to [Microsoft Search in Bing](https://docs.microsoft.com/MicrosoftSearch/security-for-search#microsoft-search-in-bing-protects-workplace-searches), Bing Answers in Cortana has implemented a set of trust measures, described below, that govern how the separate search of public results from Bing.com is handled. The Bing Answers in Cortana trust measures are consistent with the enhanced privacy and security measures described in [Microsoft Search in Bing](https://docs.microsoft.com/MicrosoftSearch/security-for-search). All Bing.com search logs that pertain to Cortana traffic are disassociated from users' workplace identity. All Cortana queries issued via a work or school account are stored separately from public, non-Cortana traffic.
+
+Bing Answers is enabled by default for all users. However, admins can configure and change this for specific users and user groups in their organization.
+
+## How the Bing Answer policy configuration is applied
+Before a query is sent to Bing for a search of public results from Bing.com, the Bing Answers service checks with the Office Cloud Policy Service to see if there are any policy configurations that pertain to the user for allowing Bing Answers to respond to questions users ask Cortana. If the user is a member of an AAD group that is assigned that policy configuration, then the appropriate policy settings are applied and a check is made again in 10 minutes.
\ No newline at end of file
diff --git a/windows/configuration/cortana-at-work/test-scenario-1.md b/windows/configuration/cortana-at-work/test-scenario-1.md
new file mode 100644
index 0000000000..27402c3b61
--- /dev/null
+++ b/windows/configuration/cortana-at-work/test-scenario-1.md
@@ -0,0 +1,46 @@
+---
+title: Test scenario 1 – Sign in with your work or school account and use Cortana to manage the notebook
+description: A test scenario about how to sign in with your work or school account and use Cortana to manage the notebook.
+ms.prod: w10
+ms.mktglfcycl: manage
+ms.sitesec: library
+author: dansimp
+ms.localizationpriority: medium
+ms.author: dansimp
+ms.date: 10/05/2017
+ms.reviewer:
+manager: dansimp
+---
+
+# Test scenario 1 – Sign in with your work or school account and use Cortana to manage the notebook
+
+This scenario turns on Azure AD and lets your employee use Cortana to manage an entry in the notebook.
+
+## Sign in with your work or school account
+
+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, then click the profile picture in the navigation to open Cortana settings.
+
+2. Click your email address.
+
+A dialog box appears, showing the associated account info.
+
+3. Click **Sign out** under your email address.
+
+This signs out the Microsoft account, letting you continue to add your work or school account.
+
+4. Open Cortana again and select the **Sign in** glyph in the left rail and follow the instructions to sign in with your work or school account.
+
+## Use Cortana to manage the notebook content
+
+This process helps you to manage the content Cortana shows in your Notebook.
+
+1. Select the **Cortana** icon in the taskbar, click **Notebook**, select **Manage Skills.** Scroll down and click **Weather**.
+
+2. In the **Weather** settings, scroll down to the **Cities you're tracking** area, and then click **Add a city**.
+
+3. Add **Redmond, Washington**.
+
+> [!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.
\ No newline at end of file
diff --git a/windows/configuration/cortana-at-work/test-scenario-2.md b/windows/configuration/cortana-at-work/test-scenario-2.md
new file mode 100644
index 0000000000..caf24e5f85
--- /dev/null
+++ b/windows/configuration/cortana-at-work/test-scenario-2.md
@@ -0,0 +1,38 @@
+---
+title: Test scenario 2 - Perform a quick search with Cortana at work
+description: A test scenario about how to perform a quick search with Cortana at work.
+ms.prod: w10
+ms.mktglfcycl: manage
+ms.sitesec: library
+author: dansimp
+ms.localizationpriority: medium
+ms.author: dansimp
+ms.date: 10/05/2017
+ms.reviewer:
+manager: dansimp
+---
+
+# Test scenario 2 – Perform a quick search with Cortana at work
+
+>[!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
+
+1. Click on the Cortana icon in the taskbar, and then click in the Search bar.
+
+2. Type **Type Weather in New York**.
+
+You should see the weather in New York, New York at the top of the search results.
+Insert screenshot
+
+## 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.
+Insert screenshot
\ No newline at end of file
diff --git a/windows/configuration/cortana-at-work/test-scenario-3.md b/windows/configuration/cortana-at-work/test-scenario-3.md
new file mode 100644
index 0000000000..e348a1cee9
--- /dev/null
+++ b/windows/configuration/cortana-at-work/test-scenario-3.md
@@ -0,0 +1,79 @@
+---
+title: Test scenario 3 - Set a reminder for a specific location using Cortana at work
+description: A test scenario about how to set up, review, and edit a reminder based on a location.
+ms.prod: w10
+ms.mktglfcycl: manage
+ms.sitesec: library
+author: dansimp
+ms.localizationpriority: medium
+ms.author: dansimp
+ms.date: 10/05/2017
+ms.reviewer:
+manager: dansimp
+---
+
+# Test scenario 3 - Set a reminder for a specific location using Cortana at work
+
+>[!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.
+
+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**.
+
+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.
+
+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.
+
+Insert screenshot 6
+
+8. Review the reminder info, and then click **Remind**.
+
+The reminder is saved and ready to be triggered.
+Insert screenshot
+
+## 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.
+insert screenshot
+
+3. Say **Yes** so Cortana can save the reminder.
+insert screenshot
+
+## 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**.
+
+2. Click the pending reminder you want to edit.
+
+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**.
\ No newline at end of file
diff --git a/windows/configuration/cortana-at-work/test-scenario-4.md b/windows/configuration/cortana-at-work/test-scenario-4.md
new file mode 100644
index 0000000000..a0ea0e6332
--- /dev/null
+++ b/windows/configuration/cortana-at-work/test-scenario-4.md
@@ -0,0 +1,52 @@
+---
+title: 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
+author: dansimp
+ms.localizationpriority: medium
+ms.author: dansimp
+ms.date: 10/05/2017
+ms.reviewer:
+manager: dansimp
+---
+
+# Test scenario 4 - Use Cortana at work to find your upcoming meetings
+
+>[!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
+screenshot
+
+## 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
+screenshot
\ No newline at end of file
diff --git a/windows/configuration/cortana-at-work/test-scenario-5.md b/windows/configuration/cortana-at-work/test-scenario-5.md
new file mode 100644
index 0000000000..ec1cb06e32
--- /dev/null
+++ b/windows/configuration/cortana-at-work/test-scenario-5.md
@@ -0,0 +1,61 @@
+---
+title: 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
+author: dansimp
+ms.localizationpriority: medium
+ms.author: dansimp
+ms.date: 10/05/2017
+ms.reviewer:
+manager: dansimp
+---
+
+# Test scenario 5 - Use Cortana to send email to a co-worker
+
+>[!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 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 **.
+
+Where 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
+screenshot
+
+## 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 .
+
+Where 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
+screenshot
+
+4. Say **Send it**.
+
+The email is sent.
+
+Cortana at work, showing the sent email text
+screenshot
\ No newline at end of file
diff --git a/windows/configuration/cortana-at-work/test-scenario-6.md b/windows/configuration/cortana-at-work/test-scenario-6.md
new file mode 100644
index 0000000000..cd22204b99
--- /dev/null
+++ b/windows/configuration/cortana-at-work/test-scenario-6.md
@@ -0,0 +1,48 @@
+---
+title: Test scenario 6 - Review a reminder suggested by Cortana based on what you’ve promised in email
+description: A test scenario about how to use Cortana with the Suggested reminders feature.
+ms.prod: w10
+ms.mktglfcycl: manage
+ms.sitesec: library
+author: dansimp
+ms.localizationpriority: medium
+ms.author: dansimp
+ms.date: 10/05/2017
+ms.reviewer:
+manager: dansimp
+---
+
+# Test scenario 6 - Review a reminder suggested by Cortana based on what you’ve promised in email
+
+>[!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. For more info, see the [Microsoft Privacy Statement](https://privacy.microsoft.com/privacystatement) and the [Microsoft Services Agreement](https://www.microsoft.com/servicesagreement).
+
+Cortana automatically finds patterns in your email, suggesting reminders based things that you said you would do so you don’t forget about them. For example, Cortana recognizes that if you include the text, I’ll get this to you by the end of the week in an email, you're making a commitment to provide something by a specific date. Cortana can now suggest that you be reminded about this event, letting you decide whether to keep it or to cancel it.
+
+>[!Important]
+>The Suggested reminders feature is currently only available in English (en-us).
+
+## Use Cortana to create suggested reminders for you
+
+1. Make sure that you've connected Cortana to Office 365. For the steps to connect, see [Set up and test Cortana with Office 365 in your organization](https://docs.microsoft.com/windows/configuration/cortana-at-work/cortana-at-work-o365).
+
+2. Click on the **Cortana** search box in the taskbar, click the **Notebook** icon, and then click **Permissions**.
+
+3. Make sure the **Contacts**, **email**, **calendar**, and **communication history** option is turned on.
+
+Permissions options for Cortana at work
+screenshot
+
+4. Click the **Notebook** icon again, click the **Suggested reminders** option, click to turn on the **All reminder suggestions cards** option, click the **Notify me when something I mentioned doing is coming up** box, and then click **Save**.
+
+Suggested reminders options for Cortana at work
+screenshot
+
+5. Create and send an email to yourself (so you can see the Suggested reminder), including the text, **I’ll finish this project by end of day today**.
+
+6. After you get the email, click on the Cortana **Home** icon, and scroll to today’s events.
+
+If the reminder has a specific date or time associated with it, like end of day, Cortana notifies you at the appropriate time and puts the reminder into the Action Center. Also from the Home screen, you can view the email where you made the promise, set aside time on your calendar, officially set the reminder, or mark the reminder as completed.
+
+Cortana Home screen with your suggested reminder showing
+screenshot
\ No newline at end of file
diff --git a/windows/configuration/cortana-at-work/testing-scenarios-using-cortana-in-business-org.md b/windows/configuration/cortana-at-work/testing-scenarios-using-cortana-in-business-org.md
new file mode 100644
index 0000000000..01bd26ace5
--- /dev/null
+++ b/windows/configuration/cortana-at-work/testing-scenarios-using-cortana-in-business-org.md
@@ -0,0 +1,25 @@
+---
+title: Testing scenarios using Cortana in your business or organization
+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
+author: dansimp
+ms.localizationpriority: medium
+ms.author: dansimp
+ms.date: 10/05/2017
+ms.reviewer:
+manager: dansimp
+---
+
+# Testing scenarios using Cortana in your business or organization
+
+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 with your work or school account and use Cortana to manage the notebook](https://docs.microsoft.com/windows/configuration/cortana-at-work/cortana-at-work-scenario-1)
+- [Perform a quick search with Cortana at work](https://docs.microsoft.com/windows/configuration/cortana-at-work/cortana-at-work-scenario-2)
+- [Set a reminder for a specific location using Cortana at work](https://docs.microsoft.com/windows/configuration/cortana-at-work/cortana-at-work-scenario-3)
+- [Use Cortana at work to find your upcoming meetings](https://docs.microsoft.com/windows/configuration/cortana-at-work/cortana-at-work-scenario-4)
+- [Use Cortana to send email to a co-worker](https://docs.microsoft.com/windows/configuration/cortana-at-work/cortana-at-work-scenario-5)
+- [Review a reminder suggested by Cortana based on what you've promised in email](https://docs.microsoft.com/windows/configuration/cortana-at-work/cortana-at-work-scenario-6)
+- [Use Cortana and Windows Information Protection (WIP) to help protect your organization's data on a device](https://docs.microsoft.com/windows/configuration/cortana-at-work/cortana-at-work-scenario-7)
\ No newline at end of file
diff --git a/windows/configuration/images/Shared_PC_1.png b/windows/configuration/images/Shared_PC_1.png
new file mode 100644
index 0000000000..bf145f6c19
Binary files /dev/null and b/windows/configuration/images/Shared_PC_1.png differ
diff --git a/windows/configuration/images/Shared_PC_2.png b/windows/configuration/images/Shared_PC_2.png
new file mode 100644
index 0000000000..c9d2362634
Binary files /dev/null and b/windows/configuration/images/Shared_PC_2.png differ
diff --git a/windows/configuration/images/Shared_PC_3.png b/windows/configuration/images/Shared_PC_3.png
new file mode 100644
index 0000000000..83b3a66fc8
Binary files /dev/null and b/windows/configuration/images/Shared_PC_3.png differ
diff --git a/windows/configuration/kiosk-xml.md b/windows/configuration/kiosk-xml.md
index c9d6d3b2c0..f09e5ee991 100644
--- a/windows/configuration/kiosk-xml.md
+++ b/windows/configuration/kiosk-xml.md
@@ -1,6 +1,6 @@
---
title: Assigned Access configuration kiosk XML reference (Windows 10)
-description: XML and XSD for kiosk device configuration.
+description: Learn about the assigned access configuration (kiosk) for XML and XSD for kiosk device configuration in Windows 10.
ms.assetid: 14DDDC96-88C7-4181-8415-B371F25726C8
ms.reviewer:
manager: dansimp
diff --git a/windows/configuration/screenshot1.png b/windows/configuration/screenshot1.png
new file mode 100644
index 0000000000..ed62740e92
Binary files /dev/null and b/windows/configuration/screenshot1.png differ
diff --git a/windows/configuration/screenshot10.png b/windows/configuration/screenshot10.png
new file mode 100644
index 0000000000..5cb1567235
Binary files /dev/null and b/windows/configuration/screenshot10.png differ
diff --git a/windows/configuration/screenshot11.png b/windows/configuration/screenshot11.png
new file mode 100644
index 0000000000..0ce852ebaa
Binary files /dev/null and b/windows/configuration/screenshot11.png differ
diff --git a/windows/configuration/screenshot12.png b/windows/configuration/screenshot12.png
new file mode 100644
index 0000000000..cd85d80c7e
Binary files /dev/null and b/windows/configuration/screenshot12.png differ
diff --git a/windows/configuration/screenshot2.png b/windows/configuration/screenshot2.png
new file mode 100644
index 0000000000..fb7995600e
Binary files /dev/null and b/windows/configuration/screenshot2.png differ
diff --git a/windows/configuration/screenshot3.png b/windows/configuration/screenshot3.png
new file mode 100644
index 0000000000..07e01661c5
Binary files /dev/null and b/windows/configuration/screenshot3.png differ
diff --git a/windows/configuration/screenshot4.png b/windows/configuration/screenshot4.png
new file mode 100644
index 0000000000..ab1f083c71
Binary files /dev/null and b/windows/configuration/screenshot4.png differ
diff --git a/windows/configuration/screenshot5.png b/windows/configuration/screenshot5.png
new file mode 100644
index 0000000000..0ec6fda3a7
Binary files /dev/null and b/windows/configuration/screenshot5.png differ
diff --git a/windows/configuration/screenshot6.png b/windows/configuration/screenshot6.png
new file mode 100644
index 0000000000..2f3284ee77
Binary files /dev/null and b/windows/configuration/screenshot6.png differ
diff --git a/windows/configuration/screenshot7.png b/windows/configuration/screenshot7.png
new file mode 100644
index 0000000000..e3d80a3ac9
Binary files /dev/null and b/windows/configuration/screenshot7.png differ
diff --git a/windows/configuration/screenshot8.png b/windows/configuration/screenshot8.png
new file mode 100644
index 0000000000..f85eaffdff
Binary files /dev/null and b/windows/configuration/screenshot8.png differ
diff --git a/windows/configuration/screenshot9.png b/windows/configuration/screenshot9.png
new file mode 100644
index 0000000000..f617991a63
Binary files /dev/null and b/windows/configuration/screenshot9.png differ
diff --git a/windows/configuration/set-up-shared-or-guest-pc.md b/windows/configuration/set-up-shared-or-guest-pc.md
index 95cf9806b1..289a37a0b6 100644
--- a/windows/configuration/set-up-shared-or-guest-pc.md
+++ b/windows/configuration/set-up-shared-or-guest-pc.md
@@ -58,7 +58,7 @@ Apps can take advantage of shared PC mode with the following three APIs:
### Customization
-Shared PC mode exposes a set of customizations to tailor the behavior to your requirements. These customizations are the options that you'll set either using MDM or a provisioning package as explained in [Configuring shared PC mode on Windows](#configuring-shared-pc-mode-on-windows). The options are listed in the following table.
+Shared PC mode exposes a set of customizations to tailor the behavior to your requirements. These customizations are the options that you'll set either using MDM or a provisioning package as explained in [Configuring Shared PC mode for Windows](#configuring-shared-pc-mode-for-windows). The options are listed in the following table.
| Setting | Value |
|:---|:---|
@@ -80,16 +80,33 @@ Shared PC mode exposes a set of customizations to tailor the behavior to your re
| Customization: SleepTimeout | Specifies all timeouts for when the PC should sleep. Enter the amount of idle time in seconds. If you don't set sleep timeout, the default of 1 hour applies. |
[Policies: Authentication](wcd/wcd-policies.md#authentication) (optional related setting) | Enables a quick first sign-in experience for a user by automatically connecting new non-admin Azure AD accounts to the pre-configured candidate local accounts.
+## Configuring Shared PC mode for Windows
-## Configuring shared PC mode on Windows
You can configure Windows to be in shared PC mode in a couple different ways:
-- Mobile device management (MDM): Shared PC mode is enabled by the [SharedPC configuration service provider (CSP)](https://msdn.microsoft.com/library/windows/hardware/mt723294.aspx). Your MDM policy can contain any of the options listed in the [Customization](#customization) section. The following image shows a Microsoft Intune policy with the shared PC options added as OMA-URI settings. [Learn more about Windows 10 policy settings in Microsoft Intune.](https://docs.microsoft.com/intune/deploy-use/windows-10-policy-settings-in-microsoft-intune)
-
+- Mobile device management (MDM): Shared PC mode is enabled by the [SharedPC configuration service provider (CSP)](https://docs.microsoft.com/windows/client-management/mdm/sharedpc-csp). To setup a shared device policy for Windows 10 in Intune, complete the following steps:
-- A provisioning package created with the Windows Configuration Designer: You can apply a provisioning package when you initially set up the PC (also known as the out-of-box-experience or OOBE), or you can apply the provisioning package to a Windows 10 PC that is already in use. The provisioning package is created in Windows Configuration Designer. Shared PC mode is enabled by the [SharedPC configuration service provider (CSP)](https://msdn.microsoft.com/library/windows/hardware/mt723294.aspx), exposed in Windows Configuration Designer as **SharedPC**.
+ 1. Go to the [Microsoft Endpoint Manager portal](https://endpoint.microsoft.com/#home).
+ 2. Select **Devices** from the navigation.
+ 3. Under **Policy**, select **Configuration profiles**.
+ 4. Select **Create profile**.
+ 5. From the **Platform** menu, select **Windows 10 and later**.
+ 6. From the **Profile** menu, select **Shared multi-user device**.
-
+ 
+
+ 7. Select **Create**.
+ 8. Enter a name for the policy (e.g. My Win10 Shared devices policy). You can optionally add a description should you wish to do so.
+ 9. Select **Next**.
+ 10. On the **Configuration settings** page, set the ‘Shared PC Mode’ value to **Enabled**.
+
+ 
+
+ 11. From this point on, you can configure any additional settings you’d like to be part of this policy, and then follow the rest of the set-up flow to its completion by selecting **Create** after **Step 6**.
+
+- A provisioning package created with the Windows Configuration Designer: You can apply a provisioning package when you initially set up the PC (also known as the out-of-box-experience or OOBE), or you can apply the provisioning package to a Windows 10 PC that is already in use. The provisioning package is created in Windows Configuration Designer. Shared PC mode is enabled by the [SharedPC configuration service provider (CSP)](https://docs.microsoft.com/windows/client-management/mdm/sharedpc-csp), exposed in Windows Configuration Designer as **SharedPC**.
+
+ 
- WMI bridge: Environments that use Group Policy can use the [MDM Bridge WMI Provider](https://msdn.microsoft.com/library/windows/desktop/dn905224.aspx) to configure the [MDM_SharedPC class](https://msdn.microsoft.com/library/windows/desktop/mt779129.aspx). For all device settings, the WMI Bridge client must be executed under local system user; for more information, see [Using PowerShell scripting with the WMI Bridge Provider](https://docs.microsoft.com/windows/client-management/mdm/using-powershell-scripting-with-the-wmi-bridge-provider). For example, open PowerShell as an administrator and enter the following:
diff --git a/windows/configuration/ue-v/uev-upgrade-uev-from-previous-releases.md b/windows/configuration/ue-v/uev-upgrade-uev-from-previous-releases.md
index bead7186c8..d726744568 100644
--- a/windows/configuration/ue-v/uev-upgrade-uev-from-previous-releases.md
+++ b/windows/configuration/ue-v/uev-upgrade-uev-from-previous-releases.md
@@ -1,6 +1,6 @@
---
title: Upgrade to UE-V for Windows 10
-description: Explains how to upgrade to the latest version of UE-V.
+description: Use these few adjustments to upgrade from User Experience Virtualization (UE-V) 2.x to the latest version of UE-V.
author: dansimp
ms.pagetype: mdop, virtualization
ms.mktglfcycl: deploy
@@ -30,7 +30,8 @@ If you’re already using UE-V 2.x and you’re planning to upgrade user devices
5. Install the UE-V template generator if you want to synchronize application settings for custom applications.
-> **Important** You can upgrade your existing UE-V installation to Windows 10, version 1607 from UE-V versions 2.1 or 2.0 only. If you are using a previous version of UE-V, you’ll need to upgrade from that version to UE-V 2.x before you upgrade to Windows 10, version 1607..
+> [!IMPORTANT]
+> You can upgrade your existing UE-V installation to Windows 10, version 1607 from UE-V versions 2.1 or 2.0 only. If you are using a previous version of UE-V, you’ll need to upgrade from that version to UE-V 2.x before you upgrade to Windows 10, version 1607.
## Upgrade user devices to Windows 10, version 1607
@@ -38,7 +39,7 @@ Performing an in-place upgrade on user devices automatically installs the UE-V s
## Verify that UE-V settings were migrated correctly
-After upgrading a user device to Windows 10, version 1607, it’s important to verify that UE-V settings and template registrations were migrated correctly during the upgrade. You can verify UE-V settings using Windows Powershell or the device’s registry.
+After upgrading a user device to Windows 10, version 1607, it’s important to verify that UE-V settings and template registrations were migrated correctly during the upgrade. You can verify UE-V settings using Windows PowerShell or the device’s registry.
**To verify UE-V settings using Windows PowerShell**
@@ -48,7 +49,8 @@ After upgrading a user device to Windows 10, version 1607, it’s important to v
3. Type **Get-UEVTemplate** and press ENTER to check that your templates are still registered.
- > **Note** You’ll need to register the NotePad template again after you upgrade the device to Windows 10.
+ > [!NOTE]
+ > You’ll need to register the NotePad template again after you upgrade the device to Windows 10.
**To verify UE-V settings using the device’s registry**
@@ -68,7 +70,8 @@ The UE-V service is the client-side component that captures user-personalized ap
With Windows 10, version 1607 and later, the UE-V service replaces the UE-V Agent and no longer requires a separate download and installation. Enable the service on user devices to start using UE-V. You can enable the service with the Group Policy editor or with Windows PowerShell.
-> **Important** The UE-V Agent used in prior releases of UE-V is replaced with the UE service. The UE-V service included with Windows 10, version 1607 and later releases, does not include the agent user interface and is configurable through cmdlets or registry settings only.
+> [!IMPORTANT]
+> The UE-V Agent used in prior releases of UE-V is replaced with the UE service. The UE-V service included with Windows 10, version 1607 and later releases, does not include the agent user interface and is configurable through cmdlets or registry settings only.
**To enable the UE-V service with Group Policy**
diff --git a/windows/configuration/ue-v/uev-working-with-custom-templates-and-the-uev-generator.md b/windows/configuration/ue-v/uev-working-with-custom-templates-and-the-uev-generator.md
index a2663f503d..0a5cc1a242 100644
--- a/windows/configuration/ue-v/uev-working-with-custom-templates-and-the-uev-generator.md
+++ b/windows/configuration/ue-v/uev-working-with-custom-templates-and-the-uev-generator.md
@@ -1,6 +1,6 @@
---
title: Working with Custom UE-V Templates and the UE-V Template Generator
-description: Working with Custom UE-V Templates and the UE-V Template Generator
+description: Create your own custom settings location templates by working with Custom User Experience Virtualization (UE-V) Templates and the UE-V Template Generator.
author: dansimp
ms.pagetype: mdop, virtualization
ms.mktglfcycl: deploy
@@ -98,9 +98,8 @@ Use the UE-V template generator to edit settings location templates. When the re
1. Create a local copy of the settings location template .xml file. UE-V settings location templates are .xml files that identify the locations where application store settings values.
- >**Note**
- A settings location template is unique because of the template **ID**. If you copy the template and rename the .xml file, template registration fails because UE-V reads the template **ID** tag in the .xml file to determine the name, not the file name of the .xml file. UE-V also reads the **Version** number to know if anything has changed. If the version number is higher, UE-V updates the template.
-
+ > [!NOTE]
+ > A settings location template is unique because of the template **ID**. If you copy the template and rename the .xml file, template registration fails because UE-V reads the template **ID** tag in the .xml file to determine the name, not the file name of the .xml file. UE-V also reads the **Version** number to know if anything has changed. If the version number is higher, UE-V updates the template.
2. Open the settings location template file with an XML editor.
diff --git a/windows/deployment/TOC.md b/windows/deployment/TOC.md
deleted file mode 100644
index d4e56af1b7..0000000000
--- a/windows/deployment/TOC.md
+++ /dev/null
@@ -1,283 +0,0 @@
-# [Deploy and update Windows 10](https://docs.microsoft.com/windows/deployment)
-## [Deployment process posters](windows-10-deployment-posters.md)
-## [Deploy Windows 10 with Microsoft 365](deploy-m365.md)
-## [What's new in Windows 10 deployment](deploy-whats-new.md)
-## [Windows 10 deployment scenarios](windows-10-deployment-scenarios.md)
-## [Windows Autopilot](windows-autopilot/windows-autopilot.md)
-
-## Subscription Activation
-### [Windows 10 Subscription Activation](windows-10-subscription-activation.md)
-### [Windows 10 Enterprise E3 in CSP](windows-10-enterprise-e3-overview.md)
-### [Configure VDA for Subscription Activation](vda-subscription-activation.md)
-### [Deploy Windows 10 Enterprise licenses](deploy-enterprise-licenses.md)
-
-## Resolve upgrade errors
-### [Resolve Windows 10 upgrade errors](upgrade/resolve-windows-10-upgrade-errors.md)
-### [Quick fixes](upgrade\quick-fixes.md)
-### [SetupDiag](upgrade/setupdiag.md)
-### [Troubleshooting upgrade errors](upgrade/troubleshoot-upgrade-errors.md)
-### [Windows error reporting](upgrade/windows-error-reporting.md)
-### [Upgrade error codes](upgrade/upgrade-error-codes.md)
-### [Log files](upgrade/log-files.md)
-### [Resolution procedures](upgrade/resolution-procedures.md)
-### [Submit Windows 10 upgrade errors](upgrade/submit-errors.md)
-
-## Deploy Windows 10
-### [Deploying Windows 10](deploy.md)
-
-### [Windows Autopilot](windows-autopilot/windows-autopilot.md)
-### [Windows 10 upgrade paths](upgrade/windows-10-upgrade-paths.md)
-### [Windows 10 edition upgrade](upgrade/windows-10-edition-upgrades.md)
-### [Windows 10 volume license media](windows-10-media.md)
-
-### [Windows 10 in S mode](s-mode.md)
-#### [Switch to Windows 10 Pro/Enterprise from S mode](windows-10-pro-in-s-mode.md)
-
-### [Windows 10 deployment test lab](windows-10-poc.md)
-#### [Deploy Windows 10 in a test lab using Microsoft Deployment Toolkit](windows-10-poc-mdt.md)
-#### [Deploy Windows 10 in a test lab using Microsoft Endpoint Configuration Manager](windows-10-poc-sc-config-mgr.md)
-
-### [Plan for Windows 10 deployment](planning/index.md)
-#### [Windows 10 Enterprise FAQ for IT Pros](planning/windows-10-enterprise-faq-itpro.md)
-#### [Windows 10 deployment considerations](planning/windows-10-deployment-considerations.md)
-#### [Windows 10 compatibility](planning/windows-10-compatibility.md)
-#### [Windows 10 infrastructure requirements](planning/windows-10-infrastructure-requirements.md)
-
-#### [Volume Activation [client]](volume-activation/volume-activation-windows-10.md)
-##### [Plan for volume activation [client]](volume-activation/plan-for-volume-activation-client.md)
-##### [Activate using Key Management Service [client]](volume-activation/activate-using-key-management-service-vamt.md)
-##### [Activate using Active Directory-based activation [client]](volume-activation/activate-using-active-directory-based-activation-client.md)
-##### [Activate clients running Windows 10](volume-activation/activate-windows-10-clients-vamt.md)
-##### [Monitor activation [client]](volume-activation/monitor-activation-client.md)
-##### [Use the Volume Activation Management Tool [client]](volume-activation/use-the-volume-activation-management-tool-client.md)
-##### [Appendix: Information sent to Microsoft during activation [client]](volume-activation/appendix-information-sent-to-microsoft-during-activation-client.md)
-
-#### [Application Compatibility Toolkit (ACT) Technical Reference](planning/act-technical-reference.md)
-##### [SUA User's Guide](planning/sua-users-guide.md)
-###### [Using the SUA Wizard](planning/using-the-sua-wizard.md)
-###### [Using the SUA Tool](planning/using-the-sua-tool.md)
-####### [Tabs on the SUA Tool Interface](planning/tabs-on-the-sua-tool-interface.md)
-####### [Showing Messages Generated by the SUA Tool](planning/showing-messages-generated-by-the-sua-tool.md)
-####### [Applying Filters to Data in the SUA Tool](planning/applying-filters-to-data-in-the-sua-tool.md)
-####### [Fixing Applications by Using the SUA Tool](planning/fixing-applications-by-using-the-sua-tool.md)
-##### [Compatibility Administrator User's Guide](planning/compatibility-administrator-users-guide.md)
-###### [Using the Compatibility Administrator Tool](planning/using-the-compatibility-administrator-tool.md)
-####### [Available Data Types and Operators in Compatibility Administrator](planning/available-data-types-and-operators-in-compatibility-administrator.md)
-####### [Searching for Fixed Applications in Compatibility Administrator](planning/searching-for-fixed-applications-in-compatibility-administrator.md)
-####### [Searching for Installed Compatibility Fixes with the Query Tool in Compatibility Administrator](planning/searching-for-installed-compatibility-fixes-with-the-query-tool-in-compatibility-administrator.md)
-####### [Creating a Custom Compatibility Fix in Compatibility Administrator](planning/creating-a-custom-compatibility-fix-in-compatibility-administrator.md)
-####### [Creating a Custom Compatibility Mode in Compatibility Administrator](planning/creating-a-custom-compatibility-mode-in-compatibility-administrator.md)
-####### [Creating an AppHelp Message in Compatibility Administrator](planning/creating-an-apphelp-message-in-compatibility-administrator.md)
-####### [Viewing the Events Screen in Compatibility Administrator](planning/viewing-the-events-screen-in-compatibility-administrator.md)
-####### [Enabling and Disabling Compatibility Fixes in Compatibility Administrator](planning/enabling-and-disabling-compatibility-fixes-in-compatibility-administrator.md)
-####### [Installing and Uninstalling Custom Compatibility Databases in Compatibility Administrator](planning/installing-and-uninstalling-custom-compatibility-databases-in-compatibility-administrator.md)
-###### [Managing Application-Compatibility Fixes and Custom Fix Databases](planning/managing-application-compatibility-fixes-and-custom-fix-databases.md)
-####### [Understanding and Using Compatibility Fixes](planning/understanding-and-using-compatibility-fixes.md)
-####### [Compatibility Fix Database Management Strategies and Deployment](planning/compatibility-fix-database-management-strategies-and-deployment.md)
-####### [Testing Your Application Mitigation Packages](planning/testing-your-application-mitigation-packages.md)
-###### [Using the Sdbinst.exe Command-Line Tool](planning/using-the-sdbinstexe-command-line-tool.md)
-##### [Compatibility Fixes for Windows 10, Windows 8, Windows 7, and Windows Vista](planning/compatibility-fixes-for-windows-8-windows-7-and-windows-vista.md)
-
-
-### Deploy Windows 10 with the Microsoft Deployment Toolkit (MDT)
-#### [Get started with MDT](deploy-windows-mdt/get-started-with-the-microsoft-deployment-toolkit.md)
-
-#### Deploy Windows 10 with MDT
-##### [Prepare for deployment with MDT](deploy-windows-mdt/prepare-for-windows-deployment-with-mdt.md)
-##### [Create a Windows 10 reference image](deploy-windows-mdt/create-a-windows-10-reference-image.md)
-##### [Deploy a Windows 10 image using MDT](deploy-windows-mdt/deploy-a-windows-10-image-using-mdt.md)
-##### [Build a distributed environment for Windows 10 deployment](deploy-windows-mdt/build-a-distributed-environment-for-windows-10-deployment.md)
-##### [Refresh a Windows 7 computer with Windows 10](deploy-windows-mdt/refresh-a-windows-7-computer-with-windows-10.md)
-##### [Replace a Windows 7 computer with a Windows 10 computer](deploy-windows-mdt/replace-a-windows-7-computer-with-a-windows-10-computer.md)
-##### [Perform an in-place upgrade to Windows 10 with MDT](deploy-windows-mdt/upgrade-to-windows-10-with-the-microsoft-deployment-toolkit.md)
-
-#### Customize MDT
-##### [Configure MDT settings](deploy-windows-mdt/configure-mdt-settings.md)
-##### [Set up MDT for BitLocker](deploy-windows-mdt/set-up-mdt-for-bitlocker.md)
-##### [Configure MDT deployment share rules](deploy-windows-mdt/configure-mdt-deployment-share-rules.md)
-##### [Configure MDT for UserExit scripts](deploy-windows-mdt/configure-mdt-for-userexit-scripts.md)
-##### [Simulate a Windows 10 deployment in a test environment](deploy-windows-mdt/simulate-a-windows-10-deployment-in-a-test-environment.md)
-##### [Use the MDT database to stage Windows 10 deployment information](deploy-windows-mdt/use-the-mdt-database-to-stage-windows-10-deployment-information.md)
-##### [Assign applications using roles in MDT](deploy-windows-mdt/assign-applications-using-roles-in-mdt.md)
-##### [Use web services in MDT](deploy-windows-mdt/use-web-services-in-mdt.md)
-##### [Use Orchestrator runbooks with MDT](deploy-windows-mdt/use-orchestrator-runbooks-with-mdt.md)
-
-### Deploy Windows 10 with Microsoft Endpoint Configuration Manager
-#### Prepare for Windows 10 deployment with Configuration Manager
-##### [Prepare for Zero Touch Installation with Configuration Manager](deploy-windows-cm/prepare-for-zero-touch-installation-of-windows-10-with-configuration-manager.md)
-##### [Create a custom Windows PE boot image with Configuration Manager](deploy-windows-cm/create-a-custom-windows-pe-boot-image-with-configuration-manager.md)
-##### [Add a Windows 10 operating system image using Configuration Manager](deploy-windows-cm/add-a-windows-10-operating-system-image-using-configuration-manager.md)
-##### [Create an application to deploy with Windows 10 using Configuration Manager](deploy-windows-cm/create-an-application-to-deploy-with-windows-10-using-configuration-manager.md)
-##### [Add drivers to a Windows 10 deployment with Windows PE using Configuration Manager](deploy-windows-cm/add-drivers-to-a-windows-10-deployment-with-windows-pe-using-configuration-manager.md)
-##### [Create a task sequence with Configuration Manager and MDT](deploy-windows-cm/create-a-task-sequence-with-configuration-manager-and-mdt.md)
-##### [Finalize the operating system configuration for Windows 10 deployment with Configuration Manager](deploy-windows-cm/finalize-the-os-configuration-for-windows-10-deployment-with-configuration-manager.md)
-
-#### Deploy Windows 10 with Configuration Manager
-##### [Deploy Windows 10 using PXE and Configuration Manager](deploy-windows-cm/deploy-windows-10-using-pxe-and-configuration-manager.md)
-##### [Refresh a Windows 7 SP1 client with Windows 10 using Configuration Manager](deploy-windows-cm/refresh-a-windows-7-client-with-windows-10-using-configuration-manager.md)
-##### [Replace a Windows 7 SP1 client with Windows 10 using Configuration Manager](deploy-windows-cm/replace-a-windows-7-client-with-windows-10-using-configuration-manager.md)
-##### [Perform an in-place upgrade to Windows 10 using Configuration Manager](deploy-windows-cm/upgrade-to-windows-10-with-configuraton-manager.md)
-
-### [Windows 10 deployment tools](windows-10-deployment-tools.md)
-
-#### [Windows 10 deployment scenarios and tools](windows-deployment-scenarios-and-tools.md)
-#### [Convert MBR partition to GPT](mbr-to-gpt.md)
-#### [Configure a PXE server to load Windows PE](configure-a-pxe-server-to-load-windows-pe.md)
-#### [Windows ADK for Windows 10 scenarios for IT Pros](windows-adk-scenarios-for-it-pros.md)
-
-#### [Deploy Windows To Go in your organization](deploy-windows-to-go.md)
-##### [Windows To Go: feature overview](planning/windows-to-go-overview.md)
-###### [Best practice recommendations for Windows To Go](planning/best-practice-recommendations-for-windows-to-go.md)
-###### [Deployment considerations for Windows To Go](planning/deployment-considerations-for-windows-to-go.md)
-###### [Prepare your organization for Windows To Go](planning/prepare-your-organization-for-windows-to-go.md)
-###### [Security and data protection considerations for Windows To Go](planning/security-and-data-protection-considerations-for-windows-to-go.md)
-###### [Windows To Go: frequently asked questions](planning/windows-to-go-frequently-asked-questions.md)
-
-#### [Volume Activation Management Tool (VAMT) Technical Reference](volume-activation/volume-activation-management-tool.md)
-##### [Introduction to VAMT](volume-activation/introduction-vamt.md)
-##### [Active Directory-Based Activation Overview](volume-activation/active-directory-based-activation-overview.md)
-##### [Install and Configure VAMT](volume-activation/install-configure-vamt.md)
-###### [VAMT Requirements](volume-activation/vamt-requirements.md)
-###### [Install VAMT](volume-activation/install-vamt.md)
-###### [Configure Client Computers](volume-activation/configure-client-computers-vamt.md)
-##### [Add and Manage Products](volume-activation/add-manage-products-vamt.md)
-###### [Add and Remove Computers](volume-activation/add-remove-computers-vamt.md)
-###### [Update Product Status](volume-activation/update-product-status-vamt.md)
-###### [Remove Products](volume-activation/remove-products-vamt.md)
-##### [Manage Product Keys](volume-activation/manage-product-keys-vamt.md)
-###### [Add and Remove a Product Key](volume-activation/add-remove-product-key-vamt.md)
-###### [Install a Product Key](volume-activation/install-product-key-vamt.md)
-###### [Install a KMS Client Key](volume-activation/install-kms-client-key-vamt.md)
-##### [Manage Activations](volume-activation/manage-activations-vamt.md)
-###### [Perform Online Activation](volume-activation/online-activation-vamt.md)
-###### [Perform Proxy Activation](volume-activation/proxy-activation-vamt.md)
-###### [Perform KMS Activation](volume-activation/kms-activation-vamt.md)
-###### [Perform Local Reactivation](volume-activation/local-reactivation-vamt.md)
-###### [Activate an Active Directory Forest Online](volume-activation/activate-forest-vamt.md)
-###### [Activate by Proxy an Active Directory Forest](volume-activation/activate-forest-by-proxy-vamt.md)
-##### [Manage VAMT Data](volume-activation/manage-vamt-data.md)
-###### [Import and Export VAMT Data](volume-activation/import-export-vamt-data.md)
-###### [Use VAMT in Windows PowerShell](volume-activation/use-vamt-in-windows-powershell.md)
-##### [VAMT Step-by-Step Scenarios](volume-activation/vamt-step-by-step.md)
-###### [Scenario 1: Online Activation](volume-activation/scenario-online-activation-vamt.md)
-###### [Scenario 2: Proxy Activation](volume-activation/scenario-proxy-activation-vamt.md)
-###### [Scenario 3: KMS Client Activation](volume-activation/scenario-kms-activation-vamt.md)
-##### [VAMT Known Issues](volume-activation/vamt-known-issues.md)
-#### [User State Migration Tool (USMT) Technical Reference](usmt/usmt-technical-reference.md)
-##### [User State Migration Tool (USMT) Overview Topics](usmt/usmt-topics.md)
-###### [User State Migration Tool (USMT) Overview](usmt/usmt-overview.md)
-###### [Getting Started with the User State Migration Tool (USMT)](usmt/getting-started-with-the-user-state-migration-tool.md)
-###### [Windows Upgrade and Migration Considerations](upgrade/windows-upgrade-and-migration-considerations.md)
-##### [User State Migration Tool (USMT) How-to topics](usmt/usmt-how-to.md)
-###### [Exclude Files and Settings](usmt/usmt-exclude-files-and-settings.md)
-###### [Extract Files from a Compressed USMT Migration Store](usmt/usmt-extract-files-from-a-compressed-migration-store.md)
-###### [Include Files and Settings](usmt/usmt-include-files-and-settings.md)
-###### [Migrate Application Settings](usmt/migrate-application-settings.md)
-###### [Migrate EFS Files and Certificates](usmt/usmt-migrate-efs-files-and-certificates.md)
-###### [Migrate User Accounts](usmt/usmt-migrate-user-accounts.md)
-###### [Reroute Files and Settings](usmt/usmt-reroute-files-and-settings.md)
-###### [Verify the Condition of a Compressed Migration Store](usmt/verify-the-condition-of-a-compressed-migration-store.md)
-##### [User State Migration Tool (USMT) Troubleshooting](usmt/usmt-troubleshooting.md)
-###### [Common Issues](usmt/usmt-common-issues.md)
-###### [Frequently Asked Questions](usmt/usmt-faq.md)
-###### [Log Files](usmt/usmt-log-files.md)
-###### [Return Codes](usmt/usmt-return-codes.md)
-###### [USMT Resources](usmt/usmt-resources.md)
-##### [User State Migration Toolkit (USMT) Reference](usmt/usmt-reference.md)
-###### [USMT Requirements](usmt/usmt-requirements.md)
-###### [USMT Best Practices](usmt/usmt-best-practices.md)
-###### [How USMT Works](usmt/usmt-how-it-works.md)
-###### [Plan Your Migration](usmt/usmt-plan-your-migration.md)
-####### [Common Migration Scenarios](usmt/usmt-common-migration-scenarios.md)
-####### [What Does USMT Migrate?](usmt/usmt-what-does-usmt-migrate.md)
-####### [Choose a Migration Store Type](usmt/usmt-choose-migration-store-type.md)
-######## [Migration Store Types Overview](usmt/migration-store-types-overview.md)
-######## [Estimate Migration Store Size](usmt/usmt-estimate-migration-store-size.md)
-######## [Hard-Link Migration Store](usmt/usmt-hard-link-migration-store.md)
-######## [Migration Store Encryption](usmt/usmt-migration-store-encryption.md)
-####### [Determine What to Migrate](usmt/usmt-determine-what-to-migrate.md)
-######## [Identify Users](usmt/usmt-identify-users.md)
-######## [Identify Applications Settings](usmt/usmt-identify-application-settings.md)
-######## [Identify Operating System Settings](usmt/usmt-identify-operating-system-settings.md)
-######## [Identify File Types, Files, and Folders](usmt/usmt-identify-file-types-files-and-folders.md)
-####### [Test Your Migration](usmt/usmt-test-your-migration.md)
-###### [User State Migration Tool (USMT) Command-line Syntax](usmt/usmt-command-line-syntax.md)
-####### [ScanState Syntax](usmt/usmt-scanstate-syntax.md)
-####### [LoadState Syntax](usmt/usmt-loadstate-syntax.md)
-####### [UsmtUtils Syntax](usmt/usmt-utilities.md)
-###### [USMT XML Reference](usmt/usmt-xml-reference.md)
-####### [Understanding Migration XML Files](usmt/understanding-migration-xml-files.md)
-####### [Config.xml File](usmt/usmt-configxml-file.md)
-####### [Customize USMT XML Files](usmt/usmt-customize-xml-files.md)
-####### [Custom XML Examples](usmt/usmt-custom-xml-examples.md)
-####### [Conflicts and Precedence](usmt/usmt-conflicts-and-precedence.md)
-####### [General Conventions](usmt/usmt-general-conventions.md)
-####### [XML File Requirements](usmt/xml-file-requirements.md)
-####### [Recognized Environment Variables](usmt/usmt-recognized-environment-variables.md)
-####### [XML Elements Library](usmt/usmt-xml-elements-library.md)
-###### [Offline Migration Reference](usmt/offline-migration-reference.md)
-### [Install fonts in Windows 10](windows-10-missing-fonts.md)
-
-## Update Windows 10
-### [Update Windows 10 in enterprise deployments](update/index.md)
-### Windows as a service
-#### [Windows as a service - introduction](update/windows-as-a-service.md)
-#### [Quick guide to Windows as a service](update/waas-quick-start.md)
-#### [Servicing stack updates](update/servicing-stack-updates.md)
-#### [Overview of Windows as a service](update/waas-overview.md)
-### [Prepare servicing strategy for Windows 10 updates](update/waas-servicing-strategy-windows-10-updates.md)
-### [Build deployment rings for Windows 10 updates](update/waas-deployment-rings-windows-10-updates.md)
-### [Assign devices to servicing channels for Windows 10 updates](update/waas-servicing-channels-windows-10-updates.md)
-### Get started
-#### [Get started with Windows Update](update/windows-update-overview.md)
-#### [How Windows Update works](update/how-windows-update-works.md)
-#### [Windows Update log files](update/windows-update-logs.md)
-#### [How to troubleshoot Windows Update](update/windows-update-troubleshooting.md)
-#### [Common Windows Update errors](update/windows-update-errors.md)
-#### [Windows Update error code reference](update/windows-update-error-reference.md)
-#### [Other Windows Update resources](update/windows-update-resources.md)
-### Optimize delivery
-#### [Optimize Windows 10 update delivery](update/waas-optimize-windows-10-updates.md)
-#### [Delivery Optimization for Windows 10 updates](update/waas-delivery-optimization.md)
-#### [Set up Delivery Optimization for Windows 10 updates](update/waas-delivery-optimization-setup.md)
-#### [Delivery Optimization reference](update/waas-delivery-optimization-reference.md)
-#### [Configure BranchCache for Windows 10 updates](update/waas-branchcache.md)
-#### [Whitepaper: Windows Updates using forward and reverse differentials](update/PSFxWhitepaper.md)
-### Monitor Windows Updates
-#### [Monitor Windows Updates with Update Compliance](update/update-compliance-monitor.md)
-#### [Get started with Update Compliance](update/update-compliance-get-started.md)
-##### [Update Compliance Configuration Script](update/update-compliance-configuration-script.md)
-##### [Manually Configuring Devices for Update Compliance](update/update-compliance-configuration-manual.md)
-#### [Use Update Compliance](update/update-compliance-using.md)
-##### [Need Attention! report](update/update-compliance-need-attention.md)
-##### [Security Update Status report](update/update-compliance-security-update-status.md)
-##### [Feature Update Status report](update/update-compliance-feature-update-status.md)
-##### [Delivery Optimization in Update Compliance](update/update-compliance-delivery-optimization.md)
-##### [Data Handling and Privacy in Update Compliance](update/update-compliance-privacy.md)
-##### [Update Compliance Schema Reference](update/update-compliance-schema.md)
-###### [WaaSUpdateStatus](update/update-compliance-schema-waasupdatestatus.md)
-###### [WaaSInsiderStatus](update/update-compliance-schema-waasinsiderstatus.md)
-###### [WaaSDeploymentStatus](update/update-compliance-schema-waasdeploymentstatus.md)
-###### [WUDOStatus](update/update-compliance-schema-wudostatus.md)
-###### [WUDOAggregatedStatus](update/update-compliance-schema-wudoaggregatedstatus.md)
-### Best practices
-#### [Best practices for feature updates on mission-critical devices](update/feature-update-mission-critical.md)
-#### [Update Windows 10 media with Dynamic Update](update/media-dynamic-update.md)
-#### [Deploy feature updates during maintenance windows](update/feature-update-maintenance-window.md)
-#### [Deploy feature updates for user-initiated installations](update/feature-update-user-install.md)
-#### [Conclusion](update/feature-update-conclusion.md)
-### [Deploy updates for Windows 10 Mobile Enterprise and Windows 10 IoT Mobile](update/waas-mobile-updates.md)
-### Use Windows Update for Business
-#### [Deploy updates using Windows Update for Business](update/waas-manage-updates-wufb.md)
-#### [Configure Windows Update for Business](update/waas-configure-wufb.md)
-#### [Enforcing compliance deadlines for updates](update/wufb-compliancedeadlines.md)
-#### [Integrate Windows Update for Business with management solutions](update/waas-integrate-wufb.md)
-#### [Walkthrough: use Group Policy to configure Windows Update for Business](update/waas-wufb-group-policy.md)
-#### [Walkthrough: use Intune to configure Windows Update for Business](https://docs.microsoft.com/intune/windows-update-for-business-configure)
-### Use Windows Server Update Services
-#### [Deploy Windows 10 updates using Windows Server Update Services](update/waas-manage-updates-wsus.md)
-#### [Enable FoD and language pack updates in Windows Update](update/fod-and-lang-packs.md)
-### [Deploy Windows 10 updates using Microsoft Endpoint Configuration Manager](update/waas-manage-updates-configuration-manager.md)
-### [Manage device restarts after updates](update/waas-restart.md)
-### [Manage additional Windows Update settings](update/waas-wu-settings.md)
-### [Determine the source of Windows updates](update/windows-update-sources.md)
diff --git a/windows/deployment/TOC.yml b/windows/deployment/TOC.yml
new file mode 100644
index 0000000000..3dda78fbb4
--- /dev/null
+++ b/windows/deployment/TOC.yml
@@ -0,0 +1,515 @@
+- name: Deploy and update Windows 10
+ href: index.yml
+ items:
+ - name: Get started
+ items:
+ - name: What's new
+ href: deploy-whats-new.md
+ - name: Windows 10 deployment scenarios
+ href: windows-10-deployment-scenarios.md
+ - name: What is Windows as a service?
+ href: update/waas-quick-start.md
+ - name: Windows update fundamentals
+ href: update/waas-overview.md
+ - name: Types of Windows updates
+ href: update/waas-quick-start.md#definitions
+ - name: Servicing the Windows 10 operating system
+ href: update/waas-servicing-strategy-windows-10-updates.md
+
+ - name: Deployment proof of concept
+ items:
+ - name: Demonstrate Autopilot deployment on a VM
+ href: windows-autopilot/demonstrate-deployment-on-vm.md
+ - name: Deploy Windows 10 with MDT and Configuration Manager
+ items:
+ - name: 'Step by step guide: Configure a test lab to deploy Windows 10'
+ href: windows-10-poc.md
+ - name: Deploy Windows 10 in a test lab using MDT
+ href: windows-10-poc-mdt.md
+ - name: Deploy Windows 10 in a test lab using Configuration Manager
+ href: windows-10-poc-sc-config-mgr.md
+ - name: Deployment process posters
+ href: windows-10-deployment-posters.md
+
+ - name: Plan
+ items:
+ - name: Create a deployment plan
+ href: update/create-deployment-plan.md
+ - name: Define readiness criteria
+ href: update/plan-define-readiness.md
+ - name: Evaluate infrastructure and tools
+ href: update/eval-infra-tools.md
+ - name: Determine application readiness
+ href: update/plan-determine-app-readiness.md
+ - name: Define your servicing strategy
+ href: update/waas-servicing-strategy-windows-10-updates.md
+ - name: Best practices for feature updates on mission-critical devices
+ href: update/feature-update-mission-critical.md
+ - name: Plan for volume activation
+ href: volume-activation/plan-for-volume-activation-client.md
+ - name: Features removed or planned for replacement
+ items:
+ - name: Windows 10 features lifecycle
+ href: planning/features-lifecycle.md
+ - name: Features we're no longer developing
+ href: planning/windows-10-deprecated-features.md
+ - name: Features we removed
+ href: planning/windows-10-removed-features.md
+
+ - name: Prepare
+ items:
+ - name: Prepare to deploy Windows 10
+ href: deploy-windows-mdt/prepare-for-windows-deployment-with-mdt.md
+ - name: Evaluate and update infrastructure
+ href: update/update-policies.md
+ - name: Set up Delivery Optimization for Windows 10 updates
+ href: update/waas-delivery-optimization-setup.md
+ - name: Configure BranchCache for Windows 10 updates
+ href: update/waas-branchcache.md
+ - name: Prepare your deployment tools
+ items:
+ - name: Register devices for deployment with Windows Autopilot
+ href: windows-autopilot/add-devices.md
+ - name: Prepare for deployment with MDT
+ href: deploy-windows-mdt/prepare-for-windows-deployment-with-mdt.md
+ - name: Prepare for deployment with Configuration Manager
+ href: deploy-windows-cm/prepare-for-zero-touch-installation-of-windows-10-with-configuration-manager.md
+ - name: Build a successful servicing strategy
+ items:
+ - name: Build deployment rings for Windows 10 updates
+ href: update/waas-deployment-rings-windows-10-updates.md
+ - name: Prepare updates using Windows Update for Business
+ href: update/waas-manage-updates-wufb.md
+ - name: Prepare updates using WSUS
+ href: update/waas-manage-updates-wsus.md
+
+ - name: Deploy
+ items:
+ - name: Deploy Windows 10
+ items:
+ - name: Deploy Windows 10 with Autopilot
+ href: windows-autopilot/windows-autopilot-scenarios.md
+ - name: Deploy Windows 10 with Configuration Manager
+ items:
+ - name: Deploy to a new device
+ href: deploy-windows-cm/deploy-windows-10-using-pxe-and-configuration-manager.md
+ - name: Refresh a device
+ href: deploy-windows-cm/refresh-a-windows-7-client-with-windows-10-using-configuration-manager.md
+ - name: Replace a device
+ href: deploy-windows-cm/replace-a-windows-7-client-with-windows-10-using-configuration-manager.md
+ - name: In-place upgrade
+ href: deploy-windows-cm/upgrade-to-windows-10-with-configuraton-manager.md
+ - name: Deploy Windows 10 with MDT
+ items:
+ - name: Deploy to a new device
+ href: deploy-windows-mdt/deploy-a-windows-10-image-using-mdt.md
+ - name: Refresh a device
+ href: deploy-windows-mdt/refresh-a-windows-7-computer-with-windows-10.md
+ - name: Replace a device
+ href: deploy-windows-mdt/replace-a-windows-7-computer-with-a-windows-10-computer.md
+ - name: In-place upgrade
+ href: deploy-windows-mdt/upgrade-to-windows-10-with-the-microsoft-deployment-toolkit.md
+ - name: Subscription Activation
+ items:
+ - name: Windows 10 Subscription Activation
+ href: windows-10-subscription-activation.md
+ - name: Windows 10 Enterprise E3 in CSP
+ href: windows-10-enterprise-e3-overview.md
+ - name: Configure VDA for Subscription Activation
+ href: vda-subscription-activation.md
+ - name: Deploy Windows 10 Enterprise licenses
+ href: deploy-enterprise-licenses.md
+ - name: Deploy Windows 10 updates
+ items:
+ - name: Assign devices to servicing channels
+ href: update/waas-servicing-channels-windows-10-updates.md
+ - name: Deploy updates with Configuration Manager
+ href: update/deploy-updates-configmgr.md
+ - name: Deploy updates with Intune
+ href: update/waas-wufb-csp-mdm.md
+ - name: Deploy updates with WSUS
+ href: update/waas-manage-updates-wsus.md
+ - name: Deploy updates with Group Policy
+ href: update/waas-wufb-group-policy.md
+ - name: Update Windows 10 media with Dynamic Update
+ href: update/media-dynamic-update.md
+ - name: Manage the Windows 10 update experience
+ items:
+ - name: Manage device restarts after updates
+ href: update/waas-restart.md
+ - name: Manage additional Windows Update settings
+ href: update/waas-wu-settings.md
+ - name: Deploy feature updates during maintenance windows
+ href: update/feature-update-maintenance-window.md
+ - name: Deploy feature updates for user-initiated installations
+ href: update/feature-update-user-install.md
+ - name: Use Windows Update for Business
+ items:
+ - name: What is Windows Update for Business?
+ href: update/waas-manage-updates-wufb.md
+ - name: Configure Windows Update for Business
+ href: update/waas-configure-wufb.md
+ - name: Enforcing compliance deadlines for updates
+ href: update/wufb-compliancedeadlines.md
+ - name: Integrate Windows Update for Business with management solutions
+ href: update/waas-integrate-wufb.md
+ - name: 'Walkthrough: use Group Policy to configure Windows Update for Business'
+ href: update/waas-wufb-group-policy.md
+ - name: 'Walkthrough: use Intune to configure Windows Update for Business'
+ href: update/waas-wufb-csp-mdm.md
+ - name: Monitor Windows 10 updates
+ items:
+ - name: Monitor Delivery Optimization
+ href: update/waas-delivery-optimization-setup.md#monitor-delivery-optimization
+ - name: Monitor Windows Updates with Update Compliance
+ items:
+ - name: Get started
+ items:
+ - name: Get started with Update Compliance
+ href: update/update-compliance-get-started.md
+ - name: Update Compliance configuration script
+ href: update/update-compliance-configuration-script.md
+ - name: Manually configuring devices for Update Compliance
+ href: update/update-compliance-configuration-manual.md
+ - name: Update Compliance monitoring
+ items:
+ - name: Use Update Compliance
+ href: update/update-compliance-using.md
+ - name: Need attention report
+ href: update/update-compliance-need-attention.md
+ - name: Security update status report
+ href: update/update-compliance-security-update-status.md
+ - name: Feature update status report
+ href: update/update-compliance-feature-update-status.md
+ - name: Delivery Optimization in Update Compliance
+ href: update/update-compliance-delivery-optimization.md
+ - name: Data handling and privacy in Update Compliance
+ href: update/update-compliance-privacy.md
+ - name: Update Compliance schema reference
+ items:
+ - name: WaaSUpdateStatus
+ href: update/update-compliance-schema-waasupdatestatus.md
+ - name: WaaSInsiderStatus
+ href: update/update-compliance-schema-waasinsiderstatus.md
+ - name: WaaSDepoymentStatus
+ href: update/update-compliance-schema-waasdeploymentstatus.md
+ - name: WUDOStatus
+ href: update/update-compliance-schema-wudostatus.md
+ - name: WUDOAggregatedStatus
+ href: update/update-compliance-schema-wudoaggregatedstatus.md
+ - name: Troubleshooting
+ items:
+ - name: Resolve upgrade errors
+ items:
+ - name: Resolve Windows 10 upgrade errors
+ href: upgrade/resolve-windows-10-upgrade-errors.md
+ - name: Quick fixes
+ href: upgrade/quick-fixes.md
+ - name: SetupDiag
+ href: upgrade/setupdiag.md
+ - name: Troubleshooting upgrade errors
+ href: upgrade/troubleshoot-upgrade-errors.md
+ - name: Windows error reporting
+ href: upgrade/windows-error-reporting.md
+ - name: Upgrade error codes
+ href: upgrade/upgrade-error-codes.md
+ - name: Log files
+ href: upgrade/log-files.md
+ - name: Resolution procedures
+ href: upgrade/resolution-procedures.md
+ - name: Submit Windows 10 upgrade errors
+ href: upgrade/submit-errors.md
+ - name: Troubleshoot Windows Update
+ items:
+ - name: How to troubleshoot Windows Update
+ href: update/windows-update-troubleshooting.md
+ - name: Determine the source of Windows Updates
+ href: update/windows-update-sources.md
+ - name: Common Windows Update errors
+ href: update/windows-update-errors.md
+ - name: Windows Update error code reference
+ href: update/windows-update-error-reference.md
+
+ - name: Reference
+ items:
+ - name: How does Windows Update work?
+ href: update/how-windows-update-works.md
+ - name: Understanding the Unified Update Platform
+ href: update/windows-update-overview.md
+ - name: Servicing stack updates
+ href: update/servicing-stack-updates.md
+ - name: How Windows Update works
+ href: update/how-windows-update-works.md
+ - name: Additional Windows Update settings
+ href: update/waas-wu-settings.md
+ - name: Delivery Optimization reference
+ href: update/waas-delivery-optimization-reference.md
+ - name: Windows 10 in S mode
+ href: windows-10-pro-in-s-mode.md
+ - name: Windows 10 deployment tools
+ items:
+ - name: Windows 10 deployment scenarios and tools
+ items:
+ - name: Convert MBR partition to GPT
+ href: mbr-to-gpt.md
+ - name: Configure a PXE server to load Windows PE
+ href: configure-a-pxe-server-to-load-windows-pe.md
+ - name: Windows ADK for Windows 10 scenarios for IT Pros
+ href: windows-adk-scenarios-for-it-pros.md
+ - name: Windows To Go
+ items:
+ - name: Deploy Windows To Go in your organization
+ href: deploy-windows-to-go.md
+ - name: "Windows To Go: feature overview"
+ href: planning/windows-to-go-overview.md
+ - name: Best practice recommendations for Windows To Go
+ href: planning/best-practice-recommendations-for-windows-to-go.md
+ - name: Deployment considerations for Windows To Go
+ href: planning/deployment-considerations-for-windows-to-go.md
+ - name: Prepare your organization for Windows To Go
+ href: planning/prepare-your-organization-for-windows-to-go.md
+ - name: Security and data protection considerations for Windows To Go
+ href: planning/security-and-data-protection-considerations-for-windows-to-go.md
+ - name: "Windows To Go: frequently asked questions"
+ href: planning/windows-to-go-frequently-asked-questions.md
+
+ - name: Volume Activation Management Tool (VAMT) technical reference
+ items:
+ - name: VAMT technical reference
+ href: volume-activation/volume-activation-management-tool.md
+ - name: Introduction to VAMT
+ href: volume-activation/introduction-vamt.md
+ - name: Active Directory-Based Activation Overview
+ href: volume-activation/active-directory-based-activation-overview.md
+ - name: Install and Configure VAMT
+ href: volume-activation/install-configure-vamt.md
+ - name: VAMT Requirements
+ href: volume-activation/vamt-requirements.md
+ - name: Install VAMT
+ href: volume-activation/install-vamt.md
+ - name: Configure Client Computers
+ href: volume-activation/configure-client-computers-vamt.md
+ - name: Add and Manage Products
+ href: volume-activation/add-manage-products-vamt.md
+ - name: Add and Remove Computers
+ href: volume-activation/add-remove-computers-vamt.md
+ - name: Update Product Status
+ href: volume-activation/update-product-status-vamt.md
+ - name: Remove Products
+ href: volume-activation/remove-products-vamt.md
+ - name: Manage Product Keys
+ href: volume-activation/manage-product-keys-vamt.md
+ - name: Add and Remove a Product Key
+ href: volume-activation/add-remove-product-key-vamt.md
+ - name: Install a Product Key
+ href: volume-activation/install-product-key-vamt.md
+ - name: Install a KMS Client Key
+ href: volume-activation/install-kms-client-key-vamt.md
+ - name: Manage Activations
+ href: volume-activation/manage-activations-vamt.md
+ - name: Perform Online Activation
+ href: volume-activation/online-activation-vamt.md
+ - name: Perform Proxy Activation
+ href: volume-activation/proxy-activation-vamt.md
+ - name: Perform KMS Activation
+ href: volume-activation/kms-activation-vamt.md
+ - name: Perform Local Reactivation
+ href: volume-activation/local-reactivation-vamt.md
+ - name: Activate an Active Directory Forest Online
+ href: volume-activation/activate-forest-vamt.md
+ - name: Activate by Proxy an Active Directory Forest
+ href: volume-activation/activate-forest-by-proxy-vamt.md
+ - name: Manage VAMT Data
+ href: volume-activation/manage-vamt-data.md
+ - name: Import and Export VAMT Data
+ href: volume-activation/import-export-vamt-data.md
+ - name: Use VAMT in Windows PowerShell
+ href: volume-activation/use-vamt-in-windows-powershell.md
+ - name: VAMT Step-by-Step Scenarios
+ href: volume-activation/vamt-step-by-step.md
+ - name: "Scenario 1: Online Activation"
+ href: volume-activation/scenario-online-activation-vamt.md
+ - name: "Scenario 2: Proxy Activation"
+ href: volume-activation/scenario-proxy-activation-vamt.md
+ - name: "Scenario 3: KMS Client Activation"
+ href: volume-activation/scenario-kms-activation-vamt.md
+ - name: VAMT Known Issues
+ href: volume-activation/vamt-known-issues.md
+
+ - name: User State Migration Tool (USMT) technical reference
+ items:
+ - name: USMT overview topics
+ items:
+ - name: USMT overview
+ href: usmt/usmt-overview.md
+ - name: Getting started with the USMT
+ href: usmt/getting-started-with-the-user-state-migration-tool.md
+ - name: Windows upgrade and migration considerations
+ href: upgrade/windows-upgrade-and-migration-considerations.md
+ - name: USMT How-to topics
+ items:
+ - name: Exclude Files and Settings
+ href: usmt/usmt-exclude-files-and-settings.md
+ - name: Extract Files from a Compressed USMT Migration Store
+ href: usmt/usmt-extract-files-from-a-compressed-migration-store.md
+ - name: Include Files and Settings
+ href: usmt/usmt-include-files-and-settings.md
+ - name: Migrate Application Settings
+ href: usmt/migrate-application-settings.md
+ - name: Migrate EFS Files and Certificates
+ href: usmt/usmt-migrate-efs-files-and-certificates.md
+ - name: Migrate User Accounts
+ href: usmt/usmt-migrate-user-accounts.md
+ - name: Reroute Files and Settings
+ href: usmt/usmt-reroute-files-and-settings.md
+ - name: Verify the Condition of a Compressed Migration Store
+ href: usmt/verify-the-condition-of-a-compressed-migration-store.md
+ - name: USMT Troubleshooting
+ href: usmt/usmt-troubleshooting.md
+ - name: Common Issues
+ href: usmt/usmt-common-issues.md
+ - name: Frequently Asked Questions
+ href: usmt/usmt-faq.md
+ - name: Log Files
+ href: usmt/usmt-log-files.md
+ - name: Return Codes
+ href: usmt/usmt-return-codes.md
+ - name: USMT Resources
+ href: usmt/usmt-resources.md
+
+ - name: USMT Reference
+ items:
+ - name: USMT Requirements
+ href: usmt/usmt-requirements.md
+ - name: USMT Best Practices
+ href: usmt/usmt-best-practices.md
+ - name: How USMT Works
+ href: usmt/usmt-how-it-works.md
+ - name: Plan Your Migration
+ href: usmt/usmt-plan-your-migration.md
+ - name: Common Migration Scenarios
+ href: usmt/usmt-common-migration-scenarios.md
+ - name: What Does USMT Migrate?
+ href: usmt/usmt-what-does-usmt-migrate.md
+ - name: Choose a Migration Store Type
+ href: usmt/usmt-choose-migration-store-type.md
+ - name: Migration Store Types Overview
+ href: usmt/migration-store-types-overview.md
+ - name: Estimate Migration Store Size
+ href: usmt/usmt-estimate-migration-store-size.md
+ - name: Hard-Link Migration Store
+ href: usmt/usmt-hard-link-migration-store.md
+ - name: Migration Store Encryption
+ href: usmt/usmt-migration-store-encryption.md
+ - name: Determine What to Migrate
+ href: usmt/usmt-determine-what-to-migrate.md
+ - name: Identify users
+ href: usmt/usmt-identify-users.md
+ - name: Identify Applications Settings
+ href: usmt/usmt-identify-application-settings.md
+ - name: Identify Operating System Settings
+ href: usmt/usmt-identify-operating-system-settings.md
+ - name: Identify File Types, Files, and Folders
+ href: usmt/usmt-identify-file-types-files-and-folders.md
+ - name: Test Your Migration
+ href: usmt/usmt-test-your-migration.md
+ - name: USMT Command-line Syntax
+ href: usmt/usmt-command-line-syntax.md
+ - name: ScanState Syntax
+ href: usmt/usmt-scanstate-syntax.md
+ - name: LoadState Syntax
+ href: usmt/usmt-loadstate-syntax.md
+ - name: UsmtUtils Syntax
+ href: usmt/usmt-utilities.md
+ - name: USMT XML Reference
+ href: usmt/usmt-xml-reference.md
+ - name: Understanding Migration XML Files
+ href: usmt/understanding-migration-xml-files.md
+ - name: Config.xml File
+ href: usmt/usmt-configxml-file.md
+ - name: Customize USMT XML Files
+ href: usmt/usmt-customize-xml-files.md
+ - name: Custom XML Examples
+ href: usmt/usmt-custom-xml-examples.md
+ - name: Conflicts and Precedence
+ href: usmt/usmt-conflicts-and-precedence.md
+ - name: General Conventions
+ href: usmt/usmt-general-conventions.md
+ - name: XML File Requirements
+ href: usmt/xml-file-requirements.md
+ - name: Recognized Environment Variables
+ href: usmt/usmt-recognized-environment-variables.md
+ - name: XML Elements Library
+ href: usmt/usmt-xml-elements-library.md
+ - name: Offline Migration Reference
+ href: usmt/offline-migration-reference.md
+
+ - name: Application Compatibility Toolkit (ACT) Technical Reference
+ items:
+ - name: SUA User's Guide
+ href: planning/sua-users-guide.md
+ - name: Using the SUA Wizard
+ href: planning/using-the-sua-wizard.md
+ - name: Using the SUA Tool
+ href: planning/using-the-sua-tool.md
+ - name: Tabs on the SUA Tool Interface
+ href: planning/tabs-on-the-sua-tool-interface.md
+ - name: Showing Messages Generated by the SUA Tool
+ href: planning/showing-messages-generated-by-the-sua-tool.md
+ - name: Applying Filters to Data in the SUA Tool
+ href: planning/applying-filters-to-data-in-the-sua-tool.md
+ - name: Fixing Applications by Using the SUA Tool
+ href: planning/fixing-applications-by-using-the-sua-tool.md
+ - name: Compatibility Fixes for Windows 10, Windows 8, Windows 7, and Windows Vista
+ href: planning/compatibility-fixes-for-windows-8-windows-7-and-windows-vista.md
+ - name: Compatibility Administrator User's Guide
+ href: planning/compatibility-administrator-users-guide.md
+ - name: Using the Compatibility Administrator Tool
+ href: planning/using-the-compatibility-administrator-tool.md
+ - name: Available Data Types and Operators in Compatibility Administrator
+ href: planning/available-data-types-and-operators-in-compatibility-administrator.md
+ - name: Searching for Fixed Applications in Compatibility Administrator
+ href: planning/searching-for-fixed-applications-in-compatibility-administrator.md
+ - name: Searching for Installed Compatibility Fixes with the Query Tool in Compatibility Administrator
+ href: planning/searching-for-installed-compatibility-fixes-with-the-query-tool-in-compatibility-administrator.md
+ - name: Creating a Custom Compatibility Fix in Compatibility Administrator
+ href: planning/creating-a-custom-compatibility-fix-in-compatibility-administrator.md
+ - name: Creating a Custom Compatibility Mode in Compatibility Administrator
+ href: planning/creating-a-custom-compatibility-mode-in-compatibility-administrator.md
+ - name: Creating an AppHelp Message in Compatibility Administrator
+ href: planning/creating-an-apphelp-message-in-compatibility-administrator.md
+ - name: Viewing the Events Screen in Compatibility Administrator
+ href: planning/viewing-the-events-screen-in-compatibility-administrator.md
+ - name: Enabling and Disabling Compatibility Fixes in Compatibility Administrator
+ href: planning/enabling-and-disabling-compatibility-fixes-in-compatibility-administrator.md
+ - name: Installing and Uninstalling Custom Compatibility Databases in Compatibility Administrator
+ href: planning/installing-and-uninstalling-custom-compatibility-databases-in-compatibility-administrator.md
+ - name: Managing Application-Compatibility Fixes and Custom Fix Databases
+ href: planning/managing-application-compatibility-fixes-and-custom-fix-databases.md
+ - name: Understanding and Using Compatibility Fixes
+ href: planning/understanding-and-using-compatibility-fixes.md
+ - name: Compatibility Fix Database Management Strategies and Deployment
+ href: planning/compatibility-fix-database-management-strategies-and-deployment.md
+ - name: Testing Your Application Mitigation Packages
+ href: planning/testing-your-application-mitigation-packages.md
+ - name: Using the Sdbinst.exe Command-Line Tool
+ href: planning/using-the-sdbinstexe-command-line-tool.md
+ - name: Volume Activation
+ href: volume-activation/volume-activation-windows-10.md
+ - name: Plan for volume activation
+ href: volume-activation/plan-for-volume-activation-client.md
+ - name: Activate using Key Management Service
+ href: volume-activation/activate-using-key-management-service-vamt.md
+ - name: Activate using Active Directory-based activation
+ href: volume-activation/activate-using-active-directory-based-activation-client.md
+ - name: Activate clients running Windows 10
+ href: volume-activation/activate-windows-10-clients-vamt.md
+ - name: Monitor activation
+ href: volume-activation/monitor-activation-client.md
+ - name: Use the Volume Activation Management Tool
+ href: volume-activation/use-the-volume-activation-management-tool-client.md
+ - name: "Appendix: Information sent to Microsoft during activation "
+ href: volume-activation/appendix-information-sent-to-microsoft-during-activation-client.md
+
+ - name: Install fonts in Windows 10
+ href: windows-10-missing-fonts.md
\ No newline at end of file
diff --git a/windows/deployment/deploy-whats-new.md b/windows/deployment/deploy-whats-new.md
index 4e60ac99b8..cff09982d3 100644
--- a/windows/deployment/deploy-whats-new.md
+++ b/windows/deployment/deploy-whats-new.md
@@ -25,14 +25,16 @@ ms.topic: article
This topic provides an overview of new solutions and online content related to deploying Windows 10 in your organization.
- For an all-up overview of new features in Windows 10, see [What's new in Windows 10](https://docs.microsoft.com/windows/whats-new/index).
-- For a detailed list of changes to Windows 10 ITPro TechNet library content, see [Online content change history](#online-content-change-history).
-## Recent additions to this page
+## Latest news
-[SetupDiag](#setupdiag) 1.6 is released.
-The [Windows ADK for Windows 10, version 1903](https://docs.microsoft.com/windows-hardware/get-started/adk-install) is available.
-New [Windows Autopilot](#windows-autopilot) content is available.
-[Windows 10 Subscription Activation](#windows-10-subscription-activation) now supports Windows 10 Education.
+[SetupDiag](#setupdiag) is included with Windows 10, version 2004 and later.
+The [Windows ADK for Windows 10, version 2004](https://docs.microsoft.com/windows-hardware/get-started/adk-install) is available.
+New capabilities are available for [Delivery Optimization](#delivery-optimization) and [Windows Update for Business](#windows-update-for-business).
+VPN support is added to [Windows Autopilot](#windows-autopilot)
+An in-place upgrade wizard is available in [Configuration Manager](#microsoft-endpoint-configuration-manager).
+The [Windows ADK](#windows-assessment-and-deployment-kit-adk) for Windows 10, version 2004 is available.
+The Windows 10 deployment and update [landing page](index.yml) has been redesigned, with additional content added and more content coming soon.
## The Modern Desktop Deployment Center
@@ -49,9 +51,36 @@ See [Deploy Windows 10 with Microsoft 365](deploy-m365.md) for an overview, whic
## Windows 10 servicing and support
-- [**Delivery Optimization**](https://docs.microsoft.com/windows/deployment/update/waas-delivery-optimization): Improved Peer Efficiency for enterprises and educational institutions with complex networks is enabled with of [new policies](https://docs.microsoft.com/windows/client-management/mdm/policy-csp-deliveryoptimization). This now supports Microsoft 365 Apps for enterprise updates, and Intune content, with Microsoft Endpoint Configuration Manager content coming soon!
-- [**Automatic Restart Sign-on (ARSO)**](https://docs.microsoft.com/windows-insider/at-work-pro/wip-4-biz-whats-new#automatic-restart-and-sign-on-arso-for-enterprises-build-18305): Windows will automatically logon as the user and lock their device in order to complete the update, ensuring that when the user returns and unlocks the device, the update will be completed.
-- [**Windows Update for Business**](https://techcommunity.microsoft.com/t5/Windows-IT-Pro-Blog/Windows-Update-for-Business-and-the-retirement-of-SAC-T/ba-p/339523): There will now be a single, common start date for phased deployments (no more SAC-T designation). In addition, there will a new notification and reboot scheduling experience for end users, the ability to enforce update installation and reboot deadlines, and the ability to provide end user control over reboots for a specific time period.
+### Delivery Optimization
+
+Windows PowerShell cmdlets for Delivery Optimization have been improved:
+
+- **Get-DeliveryOptimizationStatus** has added the **-PeerInfo** option for a real-time peak behind the scenes on peer-to-peer activity (for example the peer IP Address, bytes received / sent).
+- **Get-DeliveryOptimizationLogAnalysis** is a new cmdlet that provides a summary of the activity in your DO log (# of downloads, downloads from peers, overall peer efficiency). Use the **-ListConnections** option to for in-depth look at peer-to-peer connections.
+- **Enable-DeliveryOptimizationVerboseLogs** is a new cmdlet that enables a greater level of logging detail to assist in troubleshooting.
+
+Additional improvements in [Delivery Optimization](https://docs.microsoft.com/windows/deployment/update/waas-delivery-optimization) include:
+- Enterprise network [throttling is enhanced](https://docs.microsoft.com/windows-insider/at-work-pro/wip-4-biz-whats-new#new-download-throttling-options-for-delivery-optimization-build-18917) to optimize foreground vs. background throttling.
+- Automatic cloud-based congestion detection is available for PCs with cloud service support.
+- Improved Peer Efficiency for enterprises and educational institutions with complex networks is enabled with of [new policies](https://docs.microsoft.com/windows/client-management/mdm/policy-csp-deliveryoptimization). This now supports Microsoft 365 Apps for enterprise updates, and Intune content, with Microsoft Endpoint Configuration Manager content coming soon!
+
+The following Delivery Optimization policies are removed in the Windows 10, version 2004 release:
+
+- Percentage of Maximum Download Bandwidth (DOPercentageMaxDownloadBandwidth)
+ - Reason: Replaced with separate policies for foreground and background
+- Max Upload Bandwidth (DOMaxUploadBandwidth)
+ - Reason: impacts uploads to internet peers only, which isn't used in Enterprises.
+- Absolute max throttle (DOMaxDownloadBandwidth)
+ - Reason: separated to foreground and background
+
+### Windows Update for Business
+
+[Windows Update for Business](https://docs.microsoft.com/windows/deployment/update/waas-manage-updates-wufb) enhancements in this release include:
+- Intune console updates: target version is now available allowing you to specify which version of Windows 10 you want devices to move to. Additionally, this capability enables you to keep devices on their current version until they reach end of service. Check it out in Intune, also available as a Group Policy and Configuration Service Provider (CSP) policy.
+- Validation improvements: To ensure devices and end users stay productive and protected, Microsoft uses safeguard holds to block devices from updating when there are known issues that would impact that device. Also, to better enable IT administrators to validate on the latest release, we have created a new policy that enables admins to opt devices out of the built-in safeguard holds.
+
+- [**Automatic Restart Sign-on (ARSO)**](https://docs.microsoft.com/windows-insider/at-work-pro/wip-4-biz-whats-new#automatic-restart-and-sign-on-arso-for-enterprises-build-18305): Windows will automatically log on as the user and lock their device in order to complete the update, ensuring that when the user returns and unlocks the device, the update will be completed.
+- [**Windows Update for Business**](https://techcommunity.microsoft.com/t5/Windows-IT-Pro-Blog/Windows-Update-for-Business-and-the-retirement-of-SAC-T/ba-p/339523): There will now be a single, common start date for phased deployments (no more SAC-T designation). In addition, there will be a new notification and reboot scheduling experience for end users, the ability to enforce update installation and reboot deadlines, and the ability to provide end user control over reboots for a specific time period.
- **Update rollback improvements**: You can now automatically recover from startup failures by removing updates if the startup failure was introduced after the installation of recent driver or quality updates. When a device is unable to start up properly after the recent installation of Quality of driver updates, Windows will now automatically uninstall the updates to get the device back up and running normally.
- **Pause updates**: We have extended the ability to pause updates for both feature and monthly updates. This extension ability is for all editions of Windows 10, including Home. You can pause both feature and monthly updates for up to 35 days (seven days at a time, up to five times). Once the 35-day pause period is reached, you will need to update your device before pausing again.
- **Improved update notifications**: When there’s an update requiring you to restart your device, you’ll see a colored dot on the Power button in the Start menu and on the Windows icon in your taskbar.
@@ -70,13 +99,16 @@ Windows 10 Enterprise E3 launched in the Cloud Solution Provider (CSP) channel o
For more information, see [Windows 10 Enterprise E3 in CSP](windows-10-enterprise-e3-overview.md)
-
## Deployment solutions and tools
### Windows Autopilot
[Windows Autopilot](https://docs.microsoft.com/windows/deployment/windows-autopilot/windows-autopilot) streamlines and automates the process of setting up and configuring new devices, with minimal interaction required from the end user. You can also use Windows Autopilot to reset, repurpose and recover devices.
+With the release of Windows 10, version 2004 you can configure [Windows Autopilot user-driven](https://docs.microsoft.com/windows/deployment/windows-autopilot/user-driven) Hybrid Azure Active Directory join with VPN support. This support is also backported to Windows 10, version 1909 and 1903.
+
+If you configure the language settings in the Autopilot profile and the device is connected to Ethernet, all scenarios will now skip the language, locale, and keyboard pages. In previous versions, this was only supported with self-deploying profiles.
+
The following Windows Autopilot features are available in Windows 10, version 1903 and later:
- [Windows Autopilot for white glove deployment](https://docs.microsoft.com/windows/deployment/windows-autopilot/white-glove) is new in Windows 10, version 1903. "White glove" deployment enables partners or IT staff to pre-provision devices so they are fully configured and business ready for your users.
@@ -85,6 +117,10 @@ The following Windows Autopilot features are available in Windows 10, version 19
- Windows Autopilot is self-updating during OOBE. Starting with the Windows 10, version 1903 Autopilot functional and critical updates will begin downloading automatically during OOBE.
- Windows Autopilot will set the [diagnostics data](https://docs.microsoft.com/windows/privacy/windows-diagnostic-data) level to Full on Windows 10 version 1903 and later during OOBE.
+### Microsoft Endpoint Configuration Manager
+
+An in-place upgrade wizard is available in Configuration Manager. For more information, see [Simplifying Windows 10 deployment with Configuration Manager](https://techcommunity.microsoft.com/t5/windows-it-pro-blog/simplifying-windows-10-deployment-with-configuration-manager/ba-p/1214364).
+
### Windows 10 Subscription Activation
Windows 10 Education support has been added to Windows 10 Subscription Activation.
@@ -93,9 +129,11 @@ With Windows 10, version 1903, you can step-up from Windows 10 Pro Education to
### SetupDiag
-[SetupDiag](upgrade/setupdiag.md) is a standalone diagnostic tool that can be used to obtain details about why a Windows 10 upgrade was unsuccessful.
+[SetupDiag](upgrade/setupdiag.md) is a command-line tool that can help diagnose why a Windows 10 update failed. SetupDiag works by searching Windows Setup log files. When searching log files, SetupDiag uses a set of rules to match known issues.
-SetupDiag version 1.6.0.42 was released on 08/08/2019.
+In Windows 10, version 2004, SetupDiag is now automatically installed.
+
+During the upgrade process, Windows Setup will extract all its sources files to the **%SystemDrive%\$Windows.~bt\Sources** directory. With Windows 10, version 2004 and later, Windows Setup now also installs SetupDiag.exe to this directory. If there is an issue with the upgrade, SetupDiag is automatically run to determine the cause of the failure. If the upgrade process proceeds normally, this directory is moved under %SystemDrive%\Windows.Old for cleanup.
### Upgrade Readiness
@@ -131,21 +169,21 @@ There are many benefits to converting the partition style of a disk to GPT, incl
For more information, see [MBR2GPT.EXE](mbr-to-gpt.md).
-
### Microsoft Deployment Toolkit (MDT)
-MDT build 8456 (12/19/2018) is available, including support for Windows 10, version 1809, and Windows Server 2019.
-
-For more information about MDT, see the [MDT resource page](https://docs.microsoft.com/sccm/mdt/).
+MDT version 8456 supports Windows 10, version 2004 and earlier operating systems, including Windows Server 2019. There is currently an issue that causes MDT to incorrectly detect that UEFI is present in Windows 10, version 2004. This issue is currently under investigation.
+For the latest information about MDT, see the [MDT release notes](https://docs.microsoft.com/mem/configmgr/mdt/release-notes).
### Windows Assessment and Deployment Kit (ADK)
-The Windows Assessment and Deployment Kit (Windows ADK) contains tools that can be used by IT Pros to deploy Windows. See the following topics:
+The Windows Assessment and Deployment Kit (Windows ADK) contains tools that can be used by IT Pros to deploy Windows.
-- [What's new in ADK kits and tools](https://docs.microsoft.com/windows-hardware/get-started/what-s-new-in-kits-and-tools)
-- [Windows ADK for Windows 10 scenarios for IT Pros](windows-adk-scenarios-for-it-pros.md)
+Download the Windows ADK and Windows PE add-on for Windows 10, version 2004 [here](https://docs.microsoft.com/windows-hardware/get-started/adk-install).
+For information about what's new in the ADK, see [What's new in the Windows ADK for Windows 10, version 2004](https://docs.microsoft.com/windows-hardware/get-started/what-s-new-in-kits-and-tools#whats-new-in-the-windows-adk-for-windows-10-version-2004).
+
+Also see [Windows ADK for Windows 10 scenarios for IT Pros](windows-adk-scenarios-for-it-pros.md).
## Testing and validation guidance
@@ -159,25 +197,15 @@ For more information, see the following guides:
- [Deploy Windows 10 in a test lab using Microsoft Deployment Toolkit](windows-10-poc-mdt.md)
- [Deploy Windows 10 in a test lab using Microsoft Endpoint Configuration Manager](windows-10-poc-sc-config-mgr.md)
-
## Troubleshooting guidance
[Resolve Windows 10 upgrade errors](upgrade/resolve-windows-10-upgrade-errors.md) was published in October of 2016 and will continue to be updated with new fixes. The topic provides a detailed explanation of the Windows 10 upgrade process and instructions on how to locate, interpret, and resolve specific errors that can be encountered during the upgrade process.
-
-## Online content change history
-
-The following topics provide a change history for Windows 10 ITPro TechNet library content related to deploying and using Windows 10.
-
-[Change history for Access Protection](/windows/access-protection/change-history-for-access-protection)
-[Change history for Device Security](/windows/device-security/change-history-for-device-security)
-[Change history for Threat Protection](/windows/threat-protection/change-history-for-threat-protection)
-
## Related topics
-[Overview of Windows as a service](update/waas-overview.md)
-
[Windows 10 deployment considerations](planning/windows-10-deployment-considerations.md)
-
[Windows 10 release information](https://docs.microsoft.com/windows/windows-10/release-information)
-
[Windows 10 Specifications & Systems Requirements](https://www.microsoft.com/windows/windows-10-specifications)
-
[Windows 10 upgrade paths](upgrade/windows-10-upgrade-paths.md)
-
[Windows 10 deployment tools](windows-deployment-scenarios-and-tools.md)
+[Overview of Windows as a service](update/waas-overview.md)
+[Windows 10 deployment considerations](planning/windows-10-deployment-considerations.md)
+[Windows 10 release information](https://docs.microsoft.com/windows/windows-10/release-information)
+[Windows 10 Specifications & Systems Requirements](https://www.microsoft.com/windows/windows-10-specifications)
+[Windows 10 upgrade paths](upgrade/windows-10-upgrade-paths.md)
+[Windows 10 deployment tools](windows-deployment-scenarios-and-tools.md)
diff --git a/windows/deployment/deploy-windows-mdt/set-up-mdt-for-bitlocker.md b/windows/deployment/deploy-windows-mdt/set-up-mdt-for-bitlocker.md
index c6400f67e9..4872285d93 100644
--- a/windows/deployment/deploy-windows-mdt/set-up-mdt-for-bitlocker.md
+++ b/windows/deployment/deploy-windows-mdt/set-up-mdt-for-bitlocker.md
@@ -88,7 +88,6 @@ Following these steps, you enable the backup of BitLocker and TPM recovery infor
3. Do not enable BitLocker until recovery information is stored in AD DS for operating system drives
2. Enable the **Configure TPM platform validation profile for BIOS-based firmware configurations** policy.
3. Enable the **Configure TPM platform validation profile for native UEFI firmware configurations** policy.
- Computer Configuration / Policies / Administrative Templates / System / Trusted Platform Module Services
> [!NOTE]
> If you consistently get the error "Windows BitLocker Drive Encryption Information. The system boot information has changed since BitLocker was enabled. You must supply a BitLocker recovery password to start this system." after encrypting a computer with BitLocker, you might have to change the various "Configure TPM platform validation profile" Group Policies, as well. Whether or not you need to do this will depend on the hardware you are using.
diff --git a/windows/deployment/deploy-windows-to-go.md b/windows/deployment/deploy-windows-to-go.md
index b54532b820..52cc80097b 100644
--- a/windows/deployment/deploy-windows-to-go.md
+++ b/windows/deployment/deploy-windows-to-go.md
@@ -25,8 +25,8 @@ ms.topic: article
This topic helps you to deploy Windows To Go in your organization. Before you begin deployment, make sure that you have reviewed the topics [Windows To Go: feature overview](planning/windows-to-go-overview.md) and [Prepare your organization for Windows To Go](planning/prepare-your-organization-for-windows-to-go.md) to ensure that you have the correct hardware and are prepared to complete the deployment. You can then use the steps in this topic to start your Windows To Go deployment.
->[!IMPORTANT]
->Windows To Go is no longer being developed. The feature does not support feature updates and therefore does not enable you to stay current. It also requires a specific type of USB that is no longer supported by many OEMs.
+> [!IMPORTANT]
+> Windows To Go is removed in Windows 10, version 2004 and later operating systems. The feature does not support feature updates and therefore does not enable you to stay current. It also requires a specific type of USB that is no longer supported by many OEMs.
## Deployment tips
diff --git a/windows/deployment/index.yml b/windows/deployment/index.yml
index 2d316a4b7f..753f83e575 100644
--- a/windows/deployment/index.yml
+++ b/windows/deployment/index.yml
@@ -1,105 +1,94 @@
-### YamlMime:YamlDocument
+### YamlMime:Landing
+
+title: Windows 10 deployment resources and documentation # < 60 chars
+summary: Learn about deploying and and keeping Windows 10 up to date. # < 160 chars
-documentType: LandingData
-title: Deploy and update Windows 10
metadata:
- document_id:
- title: Deploy and update Windows 10
- description: Deploying and updating Windows 10 for IT professionals.
- keywords: deploy, update, Windows, service, Microsoft365, e5, e3
- ms.localizationpriority: high
- author: greg-lindsay
- ms.author: greglin
- manager: laurawi
- ms.topic: article
- ms.devlang: na
+ title: Windows 10 deployment resources and documentation # Required; page title displayed in search results. Include the brand. < 60 chars.
+ description: Learn about deploying Windows 10 and keeping it up to date in your organization. # Required; article description that is displayed in search results. < 160 chars.
+ services: windows-10
+ ms.service: windows-10 #Required; service per approved list. service slug assigned to your service by ACOM.
+ ms.subservice: subservice
+ ms.topic: landing-page # Required
+ ms.collection: windows-10
+ author: greg-lindsay #Required; your GitHub user alias, with correct capitalization.
+ ms.author: greglin #Required; microsoft alias of author; optional team alias.
+ ms.date: 05/27/2020 #Required; mm/dd/yyyy format.
+ localization_priority: medium
+
+# linkListType: architecture | concept | deploy | download | get-started | how-to-guide | learn | overview | quickstart | reference | tutorial | video | whats-new
-sections:
-- items:
- - type: markdown
- text: Learn about deployment of Windows 10 for IT professionals. This includes deploying the operating system, upgrading to it from previous versions and updating Windows 10.
-- items:
- - type: list
- style: cards
- className: cardsM
- columns: 3
- items:
- - href: windows-10-deployment-scenarios
- html: Understand the different ways that Windows 10 can be deployed
- image:
- src: https://docs.microsoft.com/media/common/i_deploy.svg
- title: Windows 10 deployment scenarios
- - href: update
- html: Update Windows 10 in the enterprise
- image:
- src: https://docs.microsoft.com/media/common/i_upgrade.svg
- title: Windows as a service
- - href: windows-autopilot/windows-autopilot
- html: Windows Autopilot greatly simplifies deployment of Windows devices
- image:
- src: https://docs.microsoft.com/media/common/i_delivery.svg
- title: Windows Autopilot
-- title:
-- items:
- - type: markdown
- text: "
-
-
- [Modern Desktop Deployment Center](https://docs.microsoft.com/microsoft-365/enterprise/desktop-deployment-center-home) | Check out the new Modern Deskop Deployment Center and discover content to help you with your Windows 10 and Microsoft 365 Apps for enterprise deployments. |
-
[What's new in Windows 10 deployment](deploy-whats-new.md) | See this topic for a summary of new features and some recent changes related to deploying Windows 10 in your organization. |
-
[Windows 10 deployment scenarios](windows-10-deployment-scenarios.md) | To successfully deploy the Windows 10 operating system in your organization, it is important to understand the different ways that it can be deployed, especially now that there are new scenarios to consider. Choosing among these scenarios, and understanding the key capabilities and limitations of each, is a key task. |
-
[Windows Autopilot](windows-autopilot/windows-autopilot.md) | Windows Autopilot enables an IT department to pre-configure new devices and repurpose existing devices with a simple process that requires little to no infrastructure. |
-
[Windows 10 Subscription Activation](windows-10-subscription-activation.md) | Windows 10 Enterprise has traditionally been sold as on premises software, however, with Windows 10 version 1703 (also known as the Creator’s Update), both Windows 10 Enterprise E3 and Windows 10 Enterprise E5 are available as true online services via subscription. You can move from Windows 10 Pro to Windows 10 Enterprise with no keys and no reboots. If you are using a Cloud Service Providers (CSP) see the related topic: [Windows 10 Enterprise E3 in CSP](windows-10-enterprise-e3-overview.md). |
-
[Resolve Windows 10 upgrade errors](upgrade/resolve-windows-10-upgrade-errors.md) | This topic provides a brief introduction to Windows 10 installation processes, and provides resolution procedures that IT administrators can use to resolve issues with Windows 10 upgrade. |
-
- "
-- title: Deploy Windows 10
-- items:
- - type: markdown
- text: "
- Windows 10 upgrade options are discussed and information is provided about planning, testing, and managing your production deployment.
-
- Topic | Description |
- [Overview of Windows Autopilot](windows-autopilot/windows-autopilot.md) | Windows Autopilot deployment is a new cloud service from Microsoft that provides a zero touch experience for deploying Windows 10 devices. |
-
[Windows 10 upgrade paths](upgrade/windows-10-upgrade-paths.md) | This topic provides information about support for upgrading directly to Windows 10 from a previous operating system. |
-
[Windows 10 edition upgrade](upgrade/windows-10-edition-upgrades.md) | This topic provides information about support for upgrading from one edition of Windows 10 to another. |
-
[Windows 10 volume license media](windows-10-media.md) | This topic provides information about media available in the Microsoft Volume Licensing Service Center. |
-
[Manage Windows upgrades with Upgrade Readiness](upgrade/manage-windows-upgrades-with-upgrade-readiness.md) | With Upgrade Readiness, enterprises now have the tools to plan and manage the upgrade process end to end, allowing them to adopt new Windows releases more quickly. With Windows diagnostic data enabled, Upgrade Readiness collects system, application, and driver data for analysis. We then identify compatibility issues that can block an upgrade and suggest fixes when they are known to Microsoft. The Upgrade Readiness workflow steps you through the discovery and rationalization process until you have a list of computers that are ready to be upgraded. |
-
[Windows 10 deployment test lab](windows-10-poc.md) | This guide contains instructions to configure a proof of concept (PoC) environment requiring a minimum amount of resources. The guide makes extensive use of Windows PowerShell and Hyper-V. Subsequent companion guides contain steps to deploy Windows 10 using the PoC environment. After completing this guide, additional guides are provided to deploy Windows 10 in the test lab using [Microsoft Deployment Toolkit](windows-10-poc-mdt.md) or [Microsoft Endpoint Configuration Manager](windows-10-poc-sc-config-mgr.md). |
-
[Plan for Windows 10 deployment](planning/index.md) | This section describes Windows 10 deployment considerations and provides information to assist in Windows 10 deployment planning. |
-
[Deploy Windows 10 with the Microsoft Deployment Toolkit](deploy-windows-mdt/deploy-windows-10-with-the-microsoft-deployment-toolkit.md) | This guide will walk you through the process of deploying Windows 10 in an enterprise environment using the Microsoft Deployment Toolkit (MDT). |
-
[Deploy Windows 10 with System Center 2012 R2 Configuration Manager](deploy-windows-cm/deploy-windows-10-with-system-center-2012-r2-configuration-manager.md) | If you have Microsoft System Center 2012 R2 Configuration Manager in your environment, you will most likely want to use it to deploy Windows 10. This topic will show you how to set up Configuration Manager for operating system deployment and how to integrate Configuration Manager with the Microsoft Deployment Toolkit (MDT) or. |
-
[Windows 10 deployment tools](windows-10-deployment-tools-reference.md) | Learn about available tools to deploy Windows 10, such as the Windows ADK, DISM, USMT, WDS, MDT, Windows PE and more. |
-
- "
-- title: Update Windows 10
-- items:
- - type: markdown
- text: "
- Information is provided about keeping Windows 10 up-to-date.
-
- Topic | Description |
- [Quick guide to Windows as a service](update/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](update/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](update/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](update/waas-deployment-rings-windows-10-updates.md) | Explains how to make use of servicing branches and update deferrals to manage Windows 10 updates. |
-
[Assign devices to servicing branches for Windows 10 updates](update/waas-servicing-branches-windows-10-updates.md) | Explains how to assign devices to Current Branch (CB) or Current Branch for Business (CBB) for feature and quality updates, and how to enroll devices in Windows Insider. |
-
[Monitor Windows Updates with Update Compliance](update/update-compliance-monitor.md) | Explains how to use Windows Analytics: Update Compliance to monitor and manage Windows Updates on devices in your organization. |
-
[Optimize update delivery for Windows 10 updates](update/waas-optimize-windows-10-updates.md) | Explains the benefits of using Delivery Optimization or BranchCache for update distribution. |
-
[Deploy updates for Windows 10 Mobile Enterprise and Windows 10 IoT Mobile](update/waas-mobile-updates.md) | Explains updates for Windows 10 Mobile Enterprise and Windows 10 IoT Mobile. |
-
[Deploy updates using Windows Update for Business](update/waas-manage-updates-wufb.md) | Explains how to use Windows Update for Business to manage when devices receive updates directly from Windows Update. Includes walkthroughs for configuring Windows Update for Business using Group Policy and Microsoft Intune. |
-
[Deploy Windows 10 updates using Windows Server Update Services (WSUS)](update/waas-manage-updates-wsus.md) | Explains how to use WSUS to manage Windows 10 updates. |
-
[Deploy Windows 10 updates using Microsoft Endpoint Configuration Manager](update/waas-manage-updates-configuration-manager.md) | Explains how to use Configuration Manager to manage Windows 10 updates. |
-
[Manage device restarts after updates](update/waas-restart.md) | Explains how to manage update related device restarts. |
-
[Manage additional Windows Update settings](update/waas-wu-settings.md) | Provides details about settings available to control and configure Windows Update. |
-
[Windows Insider Program for Business](update/waas-windows-insider-for-business.md) | Explains how the Windows Insider Program for Business works and how to become an insider. |
-
- "
-- title: Additional topics
-- items:
- - type: markdown
- text: "
-
- [Upgrade a Windows Phone 8.1 to Windows 10 Mobile with Mobile Device Management](upgrade/upgrade-windows-phone-8-1-to-10.md) | This topic describes how to upgrade eligible Windows Phone 8.1 devices to Windows 10 Mobile. |
-