From 8f571c62e972a214b6764e74d5318f8c142dfbc2 Mon Sep 17 00:00:00 2001 From: LizRoss Date: Mon, 10 Oct 2016 12:08:13 -0700 Subject: [PATCH 1/4] Updated with important note about cortana and office 365 --- windows/manage/manage-cortana-in-enterprise.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/windows/manage/manage-cortana-in-enterprise.md b/windows/manage/manage-cortana-in-enterprise.md index ff1aec9da2..c3f51a6190 100644 --- a/windows/manage/manage-cortana-in-enterprise.md +++ b/windows/manage/manage-cortana-in-enterprise.md @@ -15,7 +15,8 @@ localizationpriority: high - Windows 10 - Windows 10 Mobile ->Learn more about what features and functionality are supported in each Windows edition at [Compare Windows 10 Editions](https://www.microsoft.com/en-us/WindowsForBusiness/Compare). +> [!NOTE] +> Learn more about what features and functionality are supported in each Windows edition at [Compare Windows 10 Editions](https://www.microsoft.com/en-us/WindowsForBusiness/Compare). The world’s first personal digital assistant helps users get things done, even at work. Cortana includes powerful configuration options specifically to optimize for unique small to medium-sized business and enterprise environments. @@ -24,6 +25,10 @@ Cortana in Windows 10 is already great at letting your employees quickly see wh But Cortana works even harder when she connects to Office 365, helping employees prepare for meetings, learn about co-workers, and receive reminders about where they need to be so they won’t be late. +> [!IMPORTANT] +> Before your employees can use Cortana with Office 365, they must sign into Cortana using a Microsoft account (such as, @outlook.com), and then they must go to the **Connected Accounts** section of Cortana’s notebook to turn on and connect to Office 365. + + **More info:** - For specific info about what you need to know as a company administrator, including how to turn off Cortana with Office 365, see the [Cortana integration with Office 365](https://go.microsoft.com/fwlink/p/?LinkId=717378) support topic. From 77afada52089ef4c9ef67ca632974e7768f8da79 Mon Sep 17 00:00:00 2001 From: LizRoss Date: Mon, 10 Oct 2016 12:18:04 -0700 Subject: [PATCH 2/4] Fixing formatting --- windows/manage/manage-cortana-in-enterprise.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/windows/manage/manage-cortana-in-enterprise.md b/windows/manage/manage-cortana-in-enterprise.md index c3f51a6190..5fb13a4fac 100644 --- a/windows/manage/manage-cortana-in-enterprise.md +++ b/windows/manage/manage-cortana-in-enterprise.md @@ -15,8 +15,7 @@ localizationpriority: high - Windows 10 - Windows 10 Mobile -> [!NOTE] -> Learn more about what features and functionality are supported in each Windows edition at [Compare Windows 10 Editions](https://www.microsoft.com/en-us/WindowsForBusiness/Compare). +>Learn more about what features and functionality are supported in each Windows edition at [Compare Windows 10 Editions](https://www.microsoft.com/en-us/WindowsForBusiness/Compare). The world’s first personal digital assistant helps users get things done, even at work. Cortana includes powerful configuration options specifically to optimize for unique small to medium-sized business and enterprise environments. @@ -25,8 +24,8 @@ Cortana in Windows 10 is already great at letting your employees quickly see wh But Cortana works even harder when she connects to Office 365, helping employees prepare for meetings, learn about co-workers, and receive reminders about where they need to be so they won’t be late. -> [!IMPORTANT] -> Before your employees can use Cortana with Office 365, they must sign into Cortana using a Microsoft account (such as, @outlook.com), and then they must go to the **Connected Accounts** section of Cortana’s notebook to turn on and connect to Office 365. +>**Important**
+>Before your employees can use Cortana with Office 365, they must sign into Cortana using a Microsoft account (such as, @outlook.com), and then they must go to the **Connected Accounts** section of Cortana’s notebook to turn on and connect to Office 365. **More info:** From e939beb6f1fd986cc8d2b0e74a1f05029e2d22ea Mon Sep 17 00:00:00 2001 From: Greg Lindsay Date: Mon, 10 Oct 2016 12:18:55 -0700 Subject: [PATCH 3/4] minor fix to change history --- windows/deploy/change-history-for-deploy-windows-10.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/windows/deploy/change-history-for-deploy-windows-10.md b/windows/deploy/change-history-for-deploy-windows-10.md index d5ebe4beb3..f7e67993e5 100644 --- a/windows/deploy/change-history-for-deploy-windows-10.md +++ b/windows/deploy/change-history-for-deploy-windows-10.md @@ -11,6 +11,11 @@ author: greg-lindsay # Change history for Deploy Windows 10 This topic lists new and updated topics in the [Deploy Windows 10](index.md) documentation for [Windows 10 and Windows 10 Mobile](../index.md). +## October 2016 +| New or changed topic | Description | +|----------------------|-------------| +| [Resolve Windows 10 upgrade errors](resolve-windows-10-upgrade-errors.md) | New | + ## September 2016 | New or changed topic | Description | |----------------------|-------------| @@ -29,11 +34,6 @@ The topics in this library have been updated for Windows 10, version 1607 (also ======= -## October 2016 -| New or changed topic | Description | -|----------------------|-------------| -| [Resolve Windows 10 upgrade errors](resolve-windows-10-upgrade-errors.md) | New | - ## August 2016 | New or changed topic | Description | |----------------------|-------------| From 4e3fcaff4ce53ffb72c5d22bc86b14b8a429796b Mon Sep 17 00:00:00 2001 From: LizRoss Date: Mon, 10 Oct 2016 12:38:40 -0700 Subject: [PATCH 4/4] Added info about cortana topic update --- .../manage/change-history-for-manage-and-update-windows-10.md | 1 + 1 file changed, 1 insertion(+) diff --git a/windows/manage/change-history-for-manage-and-update-windows-10.md b/windows/manage/change-history-for-manage-and-update-windows-10.md index 033f598b89..dd5ab0c00c 100644 --- a/windows/manage/change-history-for-manage-and-update-windows-10.md +++ b/windows/manage/change-history-for-manage-and-update-windows-10.md @@ -16,6 +16,7 @@ This topic lists new and updated topics in the [Manage and update Windows 10](in | New or changed topic | Description | | --- | --- | +| [Cortana integration in your business or enterprise](manage-cortana-in-enterprise.md) |Added an important note about Cortana and Office 365 integration. | | [Manage connections from Windows operating system components to Microsoft services](manage-connections-from-windows-operating-system-components-to-microsoft-services.md) | Added link to the Windows Restricted Traffic Limited Functionality Baseline. | ## September 2016