If you enable this setting, employees can use Password Manager to save their passwords locally.
If you disable this setting, employees can’t use Password Manager to save their passwords locally.
If you don’t configure this setting, employees can choose whether to use Password Manager to save their passwords locally. |**Not configured:** Employees can choose whether to use Password Manager.
**Enabled (default):** Employees can use Password Manager to save passwords locally.
**Disabled:** Employees can't use Password Manager to save passwords locally. | |Configure Pop-up Blocker |Windows 10 or later |This policy setting lets you decide whether to turn on Pop-up Blocker. By default, Pop-up Blocker is turned on.
If you enable this setting, Pop-up Blocker is turned on, stopping pop-up windows from appearing.
If you disable this setting, Pop-up Blocker is turned off, letting pop-ups windows appear.
If you don’t configure this setting, employees can choose whether to use Pop-up Blocker. |**Enabled or not configured (default):** Turns on Pop-up Blocker, stopping pop-up windows.
**Disabled:** Turns off Pop-up Blocker, allowing pop-up windows. | |Configure search suggestions in Address bar |Windows 10 or later |This policy setting lets you decide whether search suggestions appear in the Address bar of Microsoft Edge. By default, employees can choose whether search suggestions appear in the Address bar of Microsoft Edge.
If you enable this setting, employees can see search suggestions in the Address bar of Microsoft Edge.
If you disable this setting, employees can't see search suggestions in the Address bar of Microsoft Edge.
If you don’t configure this setting, employees can choose whether search suggestions appear in the Address bar of Microsoft Edge. |**Not configured (default):** Employees can choose whether search suggestions appear in the Address bar of Microsoft Edge.
**Enabled:** Employees can see search suggestions in the Address bar of Microsoft Edge.
**Disabled:** Employees can’t see search suggestions in the Address bar of Microsoft Edge. | -|Configure SmartScreen Filter |Windows 10 or later |This policy setting lets you configure whether to turn on Windows Defender SmartScreen. Windows Defender SmartScreen provides warning messages to help protect your employees from potential phishing scams and malicious software. By default, Windows Defender SmartScreen is turned on.
If you enable this setting, Windows Defender SmartScreen is turned on and employees can’t turn it off.
If you disable this setting, Windows Defender SmartScreen is turned off and employees can’t turn it on.
If you don’t configure this setting, employees can choose whether to use Windows Defender SmartScreen. |**Not configured (default):** Employees can choose whether to use Windows Defender SmartScreen.
**Enabled:** Turns on Windows Defender SmartScreen, providing warning messages to your employees about potential phishing scams and malicious software.
**Disabled:** Turns off Windows Defender SmartScreen. | +|Configure SmartScreen Filter |Windows 10 or later |This policy setting lets you configure whether to turn on SmartScreen Filter. SmartScreen Filter provides warning messages to help protect your employees from potential phishing scams and malicious software. By default, SmartScreen Filter is turned on.
If you enable this setting, SmartScreen Filter is turned on and employees can’t turn it off.
If you disable this setting, SmartScreen Filter is turned off and employees can’t turn it on.
If you don’t configure this setting, employees can choose whether to use SmartScreen Filter. |**Not configured (default):** Employees can choose whether to use SmartScreen Filter.
**Enabled:** Turns on SmartScreen Filter, providing warning messages to your employees about potential phishing scams and malicious software.
**Disabled:** Turns off SmartScreen Filter. | |Configure the Enterprise Mode Site List |Windows 10 or later| This policy setting lets you configure whether to use Enterprise Mode and the Enterprise Mode Site List to address common compatibility problems with legacy apps.
If you enable this setting, Microsoft Edge looks for the Enterprise Mode Site List XML file. This file includes the sites and domains that need to be viewed using Internet Explorer 11 and Enterprise Mode.
If you disable or don’t configure this setting, Microsoft Edge won’t use the Enterprise Mode Site List XML file. In this case, employees might experience compatibility problems while using legacy apps.
**Note**
If there’s an .xml file in the cache container, IE waits 65 seconds and then checks the local cache for a newer version of the file from the server, based on standard caching rules. If the server file has a different version number than the version in the cache container, the server file is used and stored in the cache container.
If you’re already using a site list, enterprise mode continues to work during the 65 second wait; it just uses your existing site list instead of your new one.|**Enabled:** Lets you use the Enterprise Mode Site List to address common compatibility problems with legacy apps, if it’s configured.
If you use this option, you must also add the location to your site list in the `{URI}` box. When configured, any site on the list will always open in Internet Explorer 11.
**Disabled or not configured (default):** You won't be able to use the Enterprise Mode Site List.| |Prevent access to the about:flags page |Windows 10, Version 1607 or later|This policy setting lets you decide whether employees can access the about:flags page, which is used to change developer settings and to enable experimental features.
If you enable this policy setting, employees can’t access the about:flags page.
If you disable or don’t configure this setting, employees can access the about:flags page. |**Enabled:** Stops employees from using the about:flags page.
**Disabled or not configured (default):** Lets employees use the about:flags page. | -|Prevent bypassing SmartScreen prompts for files |Windows 10, Version 1511 or later |This policy setting lets you decide whether employees can override the Windows Defender SmartScreen warnings about downloading unverified files.
If you enable this setting, employees can’t ignore Windows Defender SmartScreen warnings and they’re blocked from downloading the unverified files.
If you disable or don’t configure this setting, employees can ignore Windows Defender SmartScreen warnings and continue the download process. |**Enabled:** Stops employees from ignoring the Windows Defender SmartScreen warnings about unverified files.
**Disabled or not configured (default):** Lets employees ignore the Windows Defender SmartScreen warnings about unverified files and lets them continue the download process. | -|Prevent bypassing SmartScreen prompts for sites |Windows 10, Version 1511 or later |This policy setting lets you decide whether employees can override the Windows Defender SmartScreen warnings about potentially malicious websites.
If you enable this setting, employees can’t ignore Windows Defender SmartScreen warnings and they’re blocked from continuing to the site.
If you disable or don’t configure this setting, employees can ignore Windows Defender SmartScreen warnings and continue to the site. |**Enabled:** Stops employees from ignoring the Windows Defender SmartScreen warnings about potentially malicious sites.
**Disabled or not configured (default):** Lets employees ignore the Windows Defender SmartScreen warnings about potentially malicious sites and continue to the site. | +|Prevent bypassing SmartScreen prompts for files |Windows 10, Version 1511 or later |This policy setting lets you decide whether employees can override the SmartScreen Filter warnings about downloading unverified files.
If you enable this setting, employees can’t ignore SmartScreen Filter warnings and they’re blocked from downloading the unverified files.
If you disable or don’t configure this setting, employees can ignore SmartScreen Filter warnings and continue the download process. |**Enabled:** Stops employees from ignoring the SmartScreen Filter warnings about unverified files.
**Disabled or not configured (default):** Lets employees ignore the SmartScreen Filter warnings about unverified files and lets them continue the download process. | +|Prevent bypassing SmartScreen prompts for sites |Windows 10, Version 1511 or later |This policy setting lets you decide whether employees can override the SmartScreen Filter warnings about potentially malicious websites.
If you enable this setting, employees can’t ignore SmartScreen Filter warnings and they’re blocked from continuing to the site.
If you disable or don’t configure this setting, employees can ignore SmartScreen Filter warnings and continue to the site. |**Enabled:** Stops employees from ignoring the SmartScreen Filter warnings about potentially malicious sites.
**Disabled or not configured (default):** Lets employees ignore the SmartScreen Filter warnings about potentially malicious sites and continue to the site. | |Prevent using Localhost IP address for WebRTC |Windows 10, Version 1511 or later |This policy setting lets you decide whether an employee’s Localhost IP address shows while making calls using the WebRTC protocol. By default, this setting is turned off.
If you enable this setting, Localhost IP addresses are hidden while making calls using the WebRTC protocol.
If you disable or don’t configure this setting, Localhost IP addresses are shown while making calls using the WebRTC protocol. |**Enabled:** Hides the Localhost IP address during calls using the WebRTC protocol.
**Disabled or not configured (default):** Shows the Localhost IP address during phone calls using the WebRTC protocol. | |Send all intranet sites to Internet Explorer 11 |Windows 10 or later |This policy setting lets you decide whether your intranet sites should all open using Internet Explorer 11. This setting should only be used if there are known compatibility problems with Microsoft Edge.
If you enable this setting, all intranet sites are automatically opened using Internet Explorer 11.
If you disable or don’t configure this setting, all websites, including intranet sites, are automatically opened using Microsoft Edge. |**Enabled:** Automatically opens all intranet sites using Internet Explorer 11.
**Disabled or not configured (default):** Automatically opens all websites, including intranet sites, using Microsoft Edge. | |Show message when opening sites in Internet Explorer |Windows 10, Version 1607 and later |This policy setting lets you decide whether employees see an additional page in Microsoft Edge, stating that a site has been opened using Internet Explorer 11.
If you enable this setting, employees see an additional page in Microsoft Edge, stating that a site has been opened using Internet Explorer 11.
If you disable or don’t configure this setting, the default app behavior occurs and no additional page appears. |**Enabled:** Shows an additional page in Microsoft Edge, stating that a site has been opened using Internet Explorer 11.
**Disabled or not configured (default):** Doesn’t show an additional page in Microsoft Edge, stating that a site has been opened using Internet Explorer 11. | @@ -75,14 +75,14 @@ All devices must be enrolled with Intune if you want to use the Windows Custom U |AllowPasswordManager |Windows 10 or later |Both |
**Note**
If there’s an .xml file in the cache container, IE waits 65 seconds and then checks the local cache for a newer version of the file from the server, based on standard caching rules. If the server file has a different version number than the version in the cache container, the server file is used and stored in the cache container.
If you’re already using a site list, enterprise mode continues to work during the 65 second wait; it just uses your existing site list instead of your new one.
**Example:** **Note**
`
`
URLs must be on separate lines and aren't shared between Microsoft Edge and Internet Explorer 11.
**Example:**
`
**Example:**
`
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)](../keep-secure/protect-enterprise-data-using-wip.md)
If you decide to use WIP, you must also have a management solution. This can be Microsoft Intune, Microsoft System Center Configuration Manager (version 1606 or later), or your current company-wide 3rd party mobile device management (MDM) solution.| + +## Signing in using Azure AD +Your organization must have an Azure AD tenant and your employees’ devices must all be Azure AD-joined for Cortana to work properly. For info about what an Azure AD tenant is, how to get your devices joined, and other Azure AD maintenance info, see [What is an Azure AD directory?](https://msdn.microsoft.com/library/azure/jj573650.aspx) + +## Cortana and privacy +We understand that there are some questions about Cortana and your organization’s privacy, including concerns about what info is collected by Cortana, where the info is saved, how to manage what data is collected, how to turn Cortana off, how to opt completely out of data collection, and what info is shared with other Microsoft apps and services. For more details about these concerns, see the [Cortana, Search, and privacy: FAQ](http://windows.microsoft.com/windows-10/cortana-privacy-faq) topic. + +Cortana is covered under the [Microsoft Privacy Statement](https://privacy.microsoft.com/privacystatement) and [Microsoft Services Agreement](https://www.microsoft.com/en-us/servicesagreement). + +## See also +- [What is Cortana?](http://go.microsoft.com/fwlink/p/?LinkId=746818) + +- [Cortana and Windows](http://go.microsoft.com/fwlink/?LinkId=717384) + +- [Known issues for Windows Desktop Search and Cortana in Windows 10](http://support.microsoft.com/kb/3206883/EN-US) + +- [Cortana for developers](http://go.microsoft.com/fwlink/?LinkId=717385) diff --git a/windows/manage/cortana-at-work-policy-settings.md b/windows/manage/cortana-at-work-policy-settings.md new file mode 100644 index 0000000000..83f10f7d3e --- /dev/null +++ b/windows/manage/cortana-at-work-policy-settings.md @@ -0,0 +1,44 @@ +--- +title: Use Group Policy and mobile device management (MDM) settings to configure Cortana in your organization (Windows 10) +description: The list of Group Policy and mobile device management (MDM) policy settings that apply to Cortana at work. +ms.prod: w10 +ms.mktglfcycl: manage +ms.sitesec: library +localizationpriority: high +--- + +# Use Group Policy and mobile device management (MDM) settings to configure Cortana in your organization +**Applies to:** + +- Windows 10, Windows Insider Program +- Windows 10 Mobile, Windows Insider Program + +>[!IMPORTANT] +>Some information relates to prereleased product which may be substantially modified before it's commercially released. Microsoft makes no warranties, express or implied, with respect to the information provided here. + +>[!NOTE] +>For specific info about how to set, manage, and use each of these MDM policies to configure Cortana in your enterprise, see the [Policy CSP](http://go.microsoft.com/fwlink/p/?LinkId=717380) topic, located in the configuration service provider reference topics. For specific info about how to set, manage, and use each of these Group Policies to configure Cortana in your enterprise, see the [Group Policy TechCenter](http://go.microsoft.com/fwlink/p/?LinkId=717381). + +|Group policy |MDM policy |Description | +|-------------|-----------|------------| +|Computer Configuration\Administrative Templates\Windows Components\Search\AllowCortanaAboveLock|AboveLock/AllowCortanaAboveLock|Specifies whether an employee can interact with Cortana using voice commands when the system is locked.
**NOTE**
This setting only applies to Windows 10 for desktop devices. |
+|Computer Configuration\Administrative Templates\Control Panel\Regional and Language Options\Allow input personalization|Privacy/AllowInputPersonalization|Specifies whether an employee can use voice commands with Cortana in your organization.
**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.|
+|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.|
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/windows/manage/cortana-at-work-powerbi.md b/windows/manage/cortana-at-work-powerbi.md
new file mode 100644
index 0000000000..98b90f572f
--- /dev/null
+++ b/windows/manage/cortana-at-work-powerbi.md
@@ -0,0 +1,138 @@
+---
+title: Set up and test Cortana for Power BI in your organization (Windows 10)
+description: How to integrate Cortana with Power BI to help your employees get answers directly from your key business data.
+ms.prod: w10
+ms.mktglfcycl: manage
+ms.sitesec: library
+localizationpriority: high
+---
+
+# Set up and test Cortana for Power BI in your organization
+**Applies to:**
+
+- Windows 10, Windows Insider Program
+- Windows 10 Mobile, Windows Insider Program
+
+>[!IMPORTANT]
+>Some information relates to prereleased product which may be substantially modified before it's commercially released. Microsoft makes no warranties, express or implied, with respect to the information provided here.
+
+Integration between Cortana and Power BI shows how Cortana can work with custom business analytics solutions to enable you to get answers directly from your key business data, including introducing new features that let you create custom Cortana “answers” using the full capabilities of Power BI Desktop.
+
+>[!Note]
+>Cortana for Power BI is currently only available in English. For more info about Cortana and Power BI, see [Use Power BI to create a custom Answer Page for Cortana](https://powerbi.microsoft.com/en-us/documentation/powerbi-service-cortana-desktop-entity-cards/).
+
+## Before you begin
+To use this walkthrough, you’ll need:
+
+- **Windows 10**. You’ll need to be running at least Windows 10 with the latest version from the Windows Insider Program.
+
+- **Cortana**. You need to have Cortana turned on and be logged into your account.
+
+- **Power BI account with data**. You can use an existing Power BI account, or else you can get a trial account by signing up at http://powerbi.com. Just make sure that either way, you enter some data that you can use.
+
+- **Azure Active Directory (Azure AD)/Work or School account**. You can use the account that you created for Office 365, or you can create a new one while you’re establishing your Power BI account. If you choose to use Azure AD, you must connect your Azure AD account to your Windows account.
+
+ **To connect your account to Windows**
+ a. Open **Windows Settings**, click **Accounts**, click **Access work or school**, and then in the **Connect to work or school** section, click **Connect**.
+
+ b. Follow the instructions to add your Azure Active Directory (Azure AD) account to Windows.
+
+## Set up your test environment for Cortana for Power BI
+Before you can start this testing scenario, you must first set up your test environment and data, and then you must turn on and set up Cortana to connect and work with Power BI.
+
+**To set up your test environment with Cortana and Power BI**
+
+1. Go to http://powerbi.com and sign-in with the same O365 credentials you used in the Set up and use Cortana with Office 365 topic.
+
+2. Expand the left rail by clicking the **Show the navigation pane** icon.
+
+ 
+
+3. Click **Get Data** from the left-hand navigation in Power BI.
+
+ 
+
+4. Click **Samples** from the **Content Pack Library** area of the **Get Data** screen.
+
+ 
+
+5. Click **Retail Analysis Sample**, and then click **Connect**.
+
+ 
+
+ The sample data is imported and you’re returned to the **Power BI** screen.
+
+6. Click **Dashboards** from the left pane of the **Power BI** screen, and then click **Retail Analysis Sample**.
+
+ 
+
+7. In the upper right-hand menu, click the **Settings** icon, and then click **Settings**.
+
+ 
+
+8. Click the **Datasets** tab, and then pick the **Retail Analysis Sample** dataset from the list.
+
+9. Click **Q&A and Cortana**, check the **Allow Cortana to access this dataset** box, and then click **Apply**.
+
+ 
+
+ >[!NOTE]
+ >It can take up to 30 minutes for a new dataset to appear for Power BI and Cortana. Logging in and out of Windows 10, or otherwise restarting Cortana, causes the new content to appear immediately.
If you enable a dataset for Cortana, and that dataset is part of a content pack you own, you’ll need to re-publish for your colleagues to also use it with Cortana. + +## Create a custom Answer Page for Cortana +You must create special reports, known as _Answer Pages_, to display the most commonly asked answers in Cortana. For example, if you want Cortana to quickly show sales data to your employees, you can create a 2016 sales data Answer Page that shows sales data, with various pivots, in Cortana. + +After you’ve finished creating your Answer Page, you can continue to the included testing scenarios. + + >[!NOTE] + >It can take up to 30 minutes for a custom Answer Page to appear for Power BI and Cortana. Logging in and out of Windows 10, or otherwise restarting Cortana, causes the new content to appear immediately. + +**To create a custom sales data Answer Page for Cortana** +1. In Power BI, click **My Workspace**, click **Create**, and then click **Report**. + +  + +2. In the **Create Report** screen, click the **Retail Analysis Sample**, and then click **Create**. + + A blank report page appears. + +3. In the **Visualizations** pane, click the paint roller icon, expand **Page Size**, and then pick **Cortana** from the **Type** drop-down list. + +  + +4. In the **Fields** pane, click to expand **Sales**, expand **This year sales**, and then add both **Value** and **Goal**. + +  + + The automatically generated graph is added to your blank report. You have the option to change colors, add borders, add additional visualizations, and modify this page so that it answers the question about sales data as precisely, and in as custom a way, as you want. You just need to make sure that it all stays within the page borders. + +5. In the **Visualizations** pane, click the paint roller icon again, expand **Page Information**, type _Sales data 2016_ into the **Name** box, turn on **Q&A**, and then add alternate report names (separated by commas) into the text box. + + The alternate names help Cortana to know what questions to look for and when to show this report. To also improve your results, you should avoid using the names of your report columns. + +  + +6. Click **File**, click **Save as**, and save the report as _Sales data 2016_. + + Because this is part of the Retail Analysis Sample, it will automatically be included as part of the dataset you included for Cortana. However, you will still need to log in and out of Windows 10, or otherwise restart Cortana, before the new content appears. + +## Test Scenario: Use Cortana to show info from Power BI in your organization +Now that you’ve set up your device, you can use Cortana to show your info from within Power BI. + +**To use Cortana with Power BI** +1. Click on the **Cortana** icon in the taskbar, and then click in the **Search** bar. + +2. Type _This year in sales_. + + Cortana shows you the available results. + +  + +3. In the **Power BI** area, click **This year in sales – in Retail Analysis Sample**. + + Cortana returns your custom report. + +  + +>[!NOTE] +>For more info about how to connect your own data, build your own custom Power BI cards and Answer Pages for Cortana, and how to share the cards with everyone in your organization, see [Use Power BI to create a custom Answer Page for Cortana](https://powerbi.microsoft.com/en-us/documentation/powerbi-service-cortana-desktop-entity-cards/). diff --git a/windows/manage/cortana-at-work-scenario-1.md b/windows/manage/cortana-at-work-scenario-1.md new file mode 100644 index 0000000000..4a9714a455 --- /dev/null +++ b/windows/manage/cortana-at-work-scenario-1.md @@ -0,0 +1,58 @@ +--- +title: Test scenario 1 - Sign-in to Azure AD and use Cortana to manage the notebook (Windows 10) +description: A test scenario walking you through signing in and managing the notebook. +ms.prod: w10 +ms.mktglfcycl: manage +ms.sitesec: library +localizationpriority: high +--- + +# Test scenario 1 - Sign-in to Azure AD and use Cortana to manage the notebook + +- Windows 10, Windows Insider Program +- Windows 10 Mobile, Windows Insider Program + +>[!IMPORTANT] +>Some information relates to prereleased product which may be substantially modified before it's commercially released. Microsoft makes no warranties, express or implied, with respect to the information provided here. + +>[!IMPORTANT] +>The data created as part of these scenarios will be uploaded to Microsoft’s Cloud to help Cortana learn and help your employees. This is the same info that Cortana uses in the consumer offering. + +This scenario turns on Azure AD and let's your employee use Cortana to manage an entry in the notebook. + +## Turn on Azure AD +This process helps you to sign out of a Microsoft Account and to sign into an Azure AD account. + +1. Click on the **Cortana** icon in the taskbar, click the **Notebook**, and then click **About Me**. + +2. Click your email address. + + A dialog box appears, showing the associated account info. + +3. Click your email address again, and then click **Sign out**. + + This signs out the Microsoft account, letting you continue to add and use the Azure AD account. + +4. Click the **Search** box and then the **Notebook** icon in the left rail. This will start the sign-in request. + +5. Click **Sign-In** and follow the instructions. + +6. When you’re asked to sign in, you’ll need to choose an Azure AD account, which will look like kelliecarlson@contoso.com. + + >[!IMPORTANT] + >If there’s no Azure AD account listed, you’ll need to go to **Windows Settings > Accounts > Email & app accounts**, and then click **Add a work or school account** to add it. + +## Use Cortana to manage the notebook content +This process helps you to manage the content Cortana shows in your Notebook. + +1. Click on the **Cortana** icon in the taskbar, click the **Notebook**, scroll down and click **Weather**. + +2. In the **Weather** settings, scroll down to the **Cities your tracking** area, and then click **Add a city**. + +3. Add *Redmond, Washington*, double-click the search result, click **Add**, and then click **Save**. + +  + +4. Click on the **Home** icon and scroll to the weather forecast for Redmond, Washington. + +  \ No newline at end of file diff --git a/windows/manage/cortana-at-work-scenario-2.md b/windows/manage/cortana-at-work-scenario-2.md new file mode 100644 index 0000000000..fb7b00d578 --- /dev/null +++ b/windows/manage/cortana-at-work-scenario-2.md @@ -0,0 +1,41 @@ +--- +title: Test scenario 2 - Perform a quick search with Cortana at work (Windows 10) +description: A test scenario about how to perform a quick search with Cortana at work. +ms.prod: w10 +ms.mktglfcycl: manage +ms.sitesec: library +localizationpriority: high +--- + +# Test scenario 2 - Perform a quick search with Cortana at work + +- Windows 10, Windows Insider Program +- Windows 10 Mobile, Windows Insider Program + +>[!IMPORTANT] +>Some information relates to prereleased product which may be substantially modified before it's commercially released. Microsoft makes no warranties, express or implied, with respect to the information provided here. + +>[!IMPORTANT] +>The data created as part of these scenarios will be uploaded to Microsoft’s Cloud to help Cortana learn and help your employees. This is the same info that Cortana uses in the consumer offering. + +This scenario helps you perform a quick search using Cortana, both by typing and through voice commands. + +## Search using Cortana +This process helps you use Cortana at work to perform a quick search. + +1. Click on the **Cortana** icon in the taskbar, and then click in the **Search** bar. + +2. Type *Weather in New York*. + + You should see the weather in New York, New York at the top of the search results. + +  + +## 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. + +  \ No newline at end of file diff --git a/windows/manage/cortana-at-work-scenario-3.md b/windows/manage/cortana-at-work-scenario-3.md new file mode 100644 index 0000000000..89610c7093 --- /dev/null +++ b/windows/manage/cortana-at-work-scenario-3.md @@ -0,0 +1,86 @@ +--- +title: Test scenario 3 - Set a reminder for a specific location using Cortana at work (Windows 10) +description: A test scenario about how to set a location-based reminder using Cortana at work. +ms.prod: w10 +ms.mktglfcycl: manage +ms.sitesec: library +localizationpriority: high +--- + +# Test scenario 3 - Set a reminder for a specific location using Cortana at work + +- Windows 10, Windows Insider Program +- Windows 10 Mobile, Windows Insider Program + +>[!IMPORTANT] +>Some information relates to prereleased product which may be substantially modified before it's commercially released. Microsoft makes no warranties, express or implied, with respect to the information provided here. + +>[!IMPORTANT] +>The data created as part of these scenarios will be uploaded to Microsoft’s Cloud to help Cortana learn and help your employees. This is the same info that Cortana uses in the consumer offering. + +This scenario helps you set up, review, and edit a reminder based on a location. For example, reminding yourself to grab your expense report receipts before you leave the house. + +>[!NOTE] +>You can set each reminder location individually as you create the reminders, or you can go into the **About me** screen and add both **Work** and **Home** addresses as favorites. Make sure that you use real addresses since you’ll need to go to these locations to complete your testing scenario.
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.
+
+ 
+
+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**.
\ No newline at end of file
diff --git a/windows/manage/cortana-at-work-scenario-4.md b/windows/manage/cortana-at-work-scenario-4.md
new file mode 100644
index 0000000000..56f1f6af66
--- /dev/null
+++ b/windows/manage/cortana-at-work-scenario-4.md
@@ -0,0 +1,51 @@
+---
+title: Test scenario 4 - Use Cortana at work to find your upcoming meetings (Windows 10)
+description: A test scenario about how to use Cortana at work to find your upcoming meetings.
+ms.prod: w10
+ms.mktglfcycl: manage
+ms.sitesec: library
+localizationpriority: high
+---
+
+# Test scenario 4 - Use Cortana at work to find your upcoming meetings
+
+- Windows 10, Windows Insider Program
+- Windows 10 Mobile, Windows Insider Program
+
+>[!IMPORTANT]
+>Some information relates to prereleased product which may be substantially modified before it's commercially released. Microsoft makes no warranties, express or implied, with respect to the information provided here.
+
+>[!IMPORTANT]
+>The data created as part of these scenarios will be uploaded to Microsoft’s Cloud to help Cortana learn and help your employees. This is the same info that Cortana uses in the consumer offering.
+
+This scenario helps you search for both general upcoming meetings, and specific meetings, both manually and verbally.
+
+>[!NOTE]
+>If you’ve turned on the **Meeting & reminder cards & notifications** option (in the **Meetings & reminders** option of your Notebook), you’ll also see your pending reminders on the Cortana **Home** page.
+
+## Find out about upcoming meetings
+This process helps you find your upcoming meetings.
+
+1. Check to make sure your work calendar is connected and synchronized with your Azure AD account.
+
+2. Click on the **Cortana** icon in the taskbar, and then click in the **Search** bar.
+
+3. Type _Show me my meetings for tomorrow_.
+
+ You’ll see all your meetings scheduled for the next day.
+
+ 
+
+## 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.
+
+ 
+
+
diff --git a/windows/manage/cortana-at-work-scenario-5.md b/windows/manage/cortana-at-work-scenario-5.md
new file mode 100644
index 0000000000..8373a4f4c2
--- /dev/null
+++ b/windows/manage/cortana-at-work-scenario-5.md
@@ -0,0 +1,57 @@
+---
+title: Test scenario 5 - Use Cortana to send email to a co-worker (Windows 10)
+description: A test scenario about how to use Cortana at work to send email to a co-worker.
+ms.prod: w10
+ms.mktglfcycl: manage
+ms.sitesec: library
+localizationpriority: high
+---
+
+# Test scenario 5 - Use Cortana to send email to a co-worker
+
+- Windows 10, Windows Insider Program
+- Windows 10 Mobile, Windows Insider Program
+
+>[!IMPORTANT]
+>Some information relates to prereleased product which may be substantially modified before it's commercially released. Microsoft makes no warranties, express or implied, with respect to the information provided here.
+
+>[!IMPORTANT]
+>The data created as part of these scenarios will be uploaded to Microsoft’s Cloud to help Cortana learn and help your employees. This is the same info that Cortana uses in the consumer offering.
+
+This scenario helps you to send an email to a co-worker listed in your work address book, both manually and verbally.
+
+## Send an email to a co-worker
+This process helps you to send a quick message to a co-worker from the work address book.
+
+1. Check to make sure your Microsoft Outlook or mail app is connected and synchronized with your Azure AD account.
+
+2. Click on the **Cortana** icon in the taskbar, and then click in the **Search** bar.
+
+3. Type _Send an email to <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.
+
+ 
\ No newline at end of file
diff --git a/windows/manage/cortana-at-work-scenario-6.md b/windows/manage/cortana-at-work-scenario-6.md
new file mode 100644
index 0000000000..ac15463824
--- /dev/null
+++ b/windows/manage/cortana-at-work-scenario-6.md
@@ -0,0 +1,37 @@
+---
+title: Test scenario 6 - Use Cortana and Windows Information Protection (WIP) to help protect your organization’s data on a device (Windows 10)
+description: An optional test scenario about how to use Cortana at work with Windows Information Protection (WIP).
+ms.prod: w10
+ms.mktglfcycl: manage
+ms.sitesec: library
+localizationpriority: high
+---
+
+# Test scenario 6 - Use Cortana and Windows Information Protection (WIP) to help protect your organization’s data on a device
+
+- Windows 10, Windows Insider Program
+- Windows 10 Mobile, Windows Insider Program
+
+>[!IMPORTANT]
+>Some information relates to prereleased product which may be substantially modified before it's commercially released. Microsoft makes no warranties, express or implied, with respect to the information provided here.
+
+>[!IMPORTANT]
+>The data created as part of these scenarios will be uploaded to Microsoft’s Cloud to help Cortana learn and help your employees. This is the same info that Cortana uses in the consumer offering.
+
+This optional scenario helps you to protect your organization’s data on a device, based on an inspection by Cortana.
+
+## Use Cortana and WIP to protect your organization’s data
+
+1. Create and deploy an WIP policy to your organization. For info about how to do this, see [Protect your enterprise data using Windows Information Protection (WIP)](../keep-secure/protect-enterprise-data-using-wip.md).
+
+2. Create a new email from a non-protected or personal mailbox, including the text _I’ll send you that presentation tomorrow_.
+
+3. Wait up to 2 hours to make sure everything has updated, click the **Cortana** icon in the taskbar, and then click in the **Search** bar.
+
+ Cortana automatically pulls your commitment to sending the presentation out of your email, showing it to you.
+
+4. Create a new email from a protected mailbox, including the same text as above, _I’ll send you that presentation tomorrow_.
+
+5. Wait until everything has updated again, click the **Cortana** icon in the taskbar, and then click in the **Search** bar.
+
+ Because it was in an WIP-protected email, the presentation info isn’t pulled out and it isn’t shown to you.
diff --git a/windows/manage/cortana-at-work-testing-scenarios.md b/windows/manage/cortana-at-work-testing-scenarios.md
new file mode 100644
index 0000000000..41f734e006
--- /dev/null
+++ b/windows/manage/cortana-at-work-testing-scenarios.md
@@ -0,0 +1,32 @@
+---
+title: Testing scenarios using Cortana in your business or organization (Windows 10)
+description: A list of suggested testing scenarios that you can use to test Cortana in your organization.
+ms.prod: w10
+ms.mktglfcycl: manage
+ms.sitesec: library
+localizationpriority: high
+---
+
+# Testing scenarios using Cortana in your business or organization
+**Applies to:**
+
+- Windows 10, Windows Insider Program
+- Windows 10 Mobile, Windows Insider Program
+
+>[!IMPORTANT]
+>Some information relates to prereleased product which may be substantially modified before it's commercially released. Microsoft makes no warranties, express or implied, with respect to the information provided here.
+
+We've come up with a list of suggested testing scenarios that you can use to test Cortana in your organization. After you complete all the scenarios, you should be able to:
+
+- Sign-in to Cortana using Azure AD, manage entries in the notebook, and search for content across your device, Bing, and the cloud, using Cortana.
+
+- Set a reminder and have it remind you when you’ve reached a specific location.
+
+- Search for your upcoming meetings on your work calendar.
+
+- Send an email to a co-worker from your work email app.
+
+- Use WIP to secure content on a device and then try to manage your organization’s entries in the notebook.
+
+>[!IMPORTANT]
+>The data created as part of these scenarios will be uploaded to Microsoft’s Cloud to help Cortana learn and help your employees. This is the same info that Cortana uses in the consumer offering.
\ No newline at end of file
diff --git a/windows/manage/cortana-at-work-voice-commands.md b/windows/manage/cortana-at-work-voice-commands.md
new file mode 100644
index 0000000000..766a5914ad
--- /dev/null
+++ b/windows/manage/cortana-at-work-voice-commands.md
@@ -0,0 +1,64 @@
+---
+title: Set up and test custom voice commands in Cortana for your organization (Windows 10)
+description: How to create voice commands that use Cortana to perform voice-enabled actions in your line-of-business (LOB) Universal Windows Platform (UWP) apps.
+ms.prod: w10
+ms.mktglfcycl: manage
+ms.sitesec: library
+localizationpriority: high
+---
+
+# Set up and test custom voice commands in Cortana for your organization
+**Applies to:**
+
+- Windows 10, Windows Insider Program
+- Windows 10 Mobile, Windows Insider Program
+
+>[!IMPORTANT]
+>Some information relates to prereleased product which may be substantially modified before it's commercially released. Microsoft makes no warranties, express or implied, with respect to the information provided here.
+
+Working with a developer, you can create voice commands that use Cortana to perform voice-enabled actions in your line-of-business (LOB) Universal Windows Platform (UWP) apps. These voice-enabled actions can reduce the time necessary to access your apps and to complete simple actions.
+
+>[!NOTE]
+>For more info about how your developer can extend your current apps to work directly with Cortana, see [Cortana interactions in UWP apps](https://msdn.microsoft.com/en-us/windows/uwp/input-and-devices/cortana-interactions).
+
+## High-level process
+Cortana uses a Voice Command Definition (VCD) file, aimed at an installed app, to define the actions that are to happen during certain vocal commands. A VCD file can be very simple to very complex, supporting anything from a single sound to a collection of more flexible, natural language sounds, all with the same intent.
+
+To enable voice commands in Cortana
+
+1. **Extend your LOB app.** Add a custom VCD file to your app package. This file defines what capabilities are available to Cortana from the app, letting you tell Cortana what vocal commands should be understood and handled by your app and how the app should start when the command is vocalized.
+
+ Cortana can perform actions on apps in the foreground (taking focus from Cortana) or in the background (allowing Cortana to keep focus). We recommend that you decide where an action should happen, based on what your voice command is intended to do. For example, if your voice command requires employee input, it’s best for that to happen in the foreground. However, if the app only uses basic commands and doesn’t require interaction, it can happen in the background.
+
+ - **Start Cortana with focus on your app, using specific voice-enabled statements.** [Create and install a VCD file that starts a foreground app using voice commands and Cortana](https://msdn.microsoft.com/en-us/windows/uwp/input-and-devices/launch-a-foreground-app-with-voice-commands-in-cortana).
+
+ - **Start Cortana removing focus from your app, using specific voice-enabled statements.** [Create and install a VCD file that starts a background app using voice commands and Cortana](https://msdn.microsoft.com/en-us/windows/uwp/input-and-devices/launch-a-background-app-with-voice-commands-in-cortana).
+
+2. **Install the VCD file on employees' devices**. You can use System Center Configuration Manager or Microsoft Intune to deploy and install the VCD file on your employees' devices, the same way you deploy and install any other package in your organization.
+
+## Test Scenario: Use voice commands in a Windows Store app
+While these aren't line-of-business apps, we've worked to make sure to implement a VCD file, allowing you to test how the functionality works with Cortana in your organization.
+
+**To get a Windows Store app**
+1. Go to the Windows Store, scroll down to the **Collections** area, click **Show All**, and then click **Better with Cortana**.
+
+2. Click **Uber**, and then click **Install**.
+
+3. Open Uber, create an account or sign in, and then close the app.
+
+**To set up the app with Cortana**
+1. Click on the **Cortana** search box in the taskbar, and then click the **Notebook** icon.
+
+2. Click on **Connected Services**, click **Uber**, and then click **Connect**.
+
+ 
+
+**To use the voice-enabled commands with Cortana**
+1. Click on the **Cortana** icon in the taskbar, and then click the **Microphone** icon (to the right of the **Search** box).
+
+2. Say _Uber get me a taxi_.
+
+ Cortana changes, letting you provide your trip details for Uber.
+
+## See also
+- [Cortana for developers](http://go.microsoft.com/fwlink/?LinkId=717385)
\ No newline at end of file
diff --git a/windows/manage/images/cortana-about-me.png b/windows/manage/images/cortana-about-me.png
new file mode 100644
index 0000000000..32c1ccefab
Binary files /dev/null and b/windows/manage/images/cortana-about-me.png differ
diff --git a/windows/manage/images/cortana-add-reminder.png b/windows/manage/images/cortana-add-reminder.png
new file mode 100644
index 0000000000..3f03528e11
Binary files /dev/null and b/windows/manage/images/cortana-add-reminder.png differ
diff --git a/windows/manage/images/cortana-chicago-weather.png b/windows/manage/images/cortana-chicago-weather.png
new file mode 100644
index 0000000000..9273bf201b
Binary files /dev/null and b/windows/manage/images/cortana-chicago-weather.png differ
diff --git a/windows/manage/images/cortana-complete-send-email-coworker-mic.png b/windows/manage/images/cortana-complete-send-email-coworker-mic.png
new file mode 100644
index 0000000000..3238c8d31d
Binary files /dev/null and b/windows/manage/images/cortana-complete-send-email-coworker-mic.png differ
diff --git a/windows/manage/images/cortana-connect-crm.png b/windows/manage/images/cortana-connect-crm.png
new file mode 100644
index 0000000000..c70c42f75e
Binary files /dev/null and b/windows/manage/images/cortana-connect-crm.png differ
diff --git a/windows/manage/images/cortana-connect-o365.png b/windows/manage/images/cortana-connect-o365.png
new file mode 100644
index 0000000000..df1ffa449b
Binary files /dev/null and b/windows/manage/images/cortana-connect-o365.png differ
diff --git a/windows/manage/images/cortana-connect-uber.png b/windows/manage/images/cortana-connect-uber.png
new file mode 100644
index 0000000000..724fecb5b5
Binary files /dev/null and b/windows/manage/images/cortana-connect-uber.png differ
diff --git a/windows/manage/images/cortana-crm-screen.png b/windows/manage/images/cortana-crm-screen.png
new file mode 100644
index 0000000000..ded5d80a59
Binary files /dev/null and b/windows/manage/images/cortana-crm-screen.png differ
diff --git a/windows/manage/images/cortana-feedback.png b/windows/manage/images/cortana-feedback.png
new file mode 100644
index 0000000000..6e14018c98
Binary files /dev/null and b/windows/manage/images/cortana-feedback.png differ
diff --git a/windows/manage/images/cortana-final-reminder.png b/windows/manage/images/cortana-final-reminder.png
new file mode 100644
index 0000000000..f114e058e5
Binary files /dev/null and b/windows/manage/images/cortana-final-reminder.png differ
diff --git a/windows/manage/images/cortana-meeting-specific-time.png b/windows/manage/images/cortana-meeting-specific-time.png
new file mode 100644
index 0000000000..a108355133
Binary files /dev/null and b/windows/manage/images/cortana-meeting-specific-time.png differ
diff --git a/windows/manage/images/cortana-meeting-tomorrow.png b/windows/manage/images/cortana-meeting-tomorrow.png
new file mode 100644
index 0000000000..13273b6600
Binary files /dev/null and b/windows/manage/images/cortana-meeting-tomorrow.png differ
diff --git a/windows/manage/images/cortana-newyork-weather.png b/windows/manage/images/cortana-newyork-weather.png
new file mode 100644
index 0000000000..b3879737be
Binary files /dev/null and b/windows/manage/images/cortana-newyork-weather.png differ
diff --git a/windows/manage/images/cortana-o365-screen.png b/windows/manage/images/cortana-o365-screen.png
new file mode 100644
index 0000000000..ba06dd6de5
Binary files /dev/null and b/windows/manage/images/cortana-o365-screen.png differ
diff --git a/windows/manage/images/cortana-place-reminder.png b/windows/manage/images/cortana-place-reminder.png
new file mode 100644
index 0000000000..89ccdab3e3
Binary files /dev/null and b/windows/manage/images/cortana-place-reminder.png differ
diff --git a/windows/manage/images/cortana-powerbi-create-report.png b/windows/manage/images/cortana-powerbi-create-report.png
new file mode 100644
index 0000000000..a22789d72a
Binary files /dev/null and b/windows/manage/images/cortana-powerbi-create-report.png differ
diff --git a/windows/manage/images/cortana-powerbi-expand-nav.png b/windows/manage/images/cortana-powerbi-expand-nav.png
new file mode 100644
index 0000000000..c8b47943f9
Binary files /dev/null and b/windows/manage/images/cortana-powerbi-expand-nav.png differ
diff --git a/windows/manage/images/cortana-powerbi-field-selection.png b/windows/manage/images/cortana-powerbi-field-selection.png
new file mode 100644
index 0000000000..8aef58c23a
Binary files /dev/null and b/windows/manage/images/cortana-powerbi-field-selection.png differ
diff --git a/windows/manage/images/cortana-powerbi-getdata-samples.png b/windows/manage/images/cortana-powerbi-getdata-samples.png
new file mode 100644
index 0000000000..3bfa4792df
Binary files /dev/null and b/windows/manage/images/cortana-powerbi-getdata-samples.png differ
diff --git a/windows/manage/images/cortana-powerbi-getdata.png b/windows/manage/images/cortana-powerbi-getdata.png
new file mode 100644
index 0000000000..55b7b61589
Binary files /dev/null and b/windows/manage/images/cortana-powerbi-getdata.png differ
diff --git a/windows/manage/images/cortana-powerbi-myreport.png b/windows/manage/images/cortana-powerbi-myreport.png
new file mode 100644
index 0000000000..cc04d9c6f0
Binary files /dev/null and b/windows/manage/images/cortana-powerbi-myreport.png differ
diff --git a/windows/manage/images/cortana-powerbi-pagesize.png b/windows/manage/images/cortana-powerbi-pagesize.png
new file mode 100644
index 0000000000..fd1c1ef917
Binary files /dev/null and b/windows/manage/images/cortana-powerbi-pagesize.png differ
diff --git a/windows/manage/images/cortana-powerbi-report-qna.png b/windows/manage/images/cortana-powerbi-report-qna.png
new file mode 100644
index 0000000000..d17949aa8a
Binary files /dev/null and b/windows/manage/images/cortana-powerbi-report-qna.png differ
diff --git a/windows/manage/images/cortana-powerbi-retail-analysis-dashboard.png b/windows/manage/images/cortana-powerbi-retail-analysis-dashboard.png
new file mode 100644
index 0000000000..5b94a2e2fc
Binary files /dev/null and b/windows/manage/images/cortana-powerbi-retail-analysis-dashboard.png differ
diff --git a/windows/manage/images/cortana-powerbi-retail-analysis-dataset.png b/windows/manage/images/cortana-powerbi-retail-analysis-dataset.png
new file mode 100644
index 0000000000..b2ffec3b70
Binary files /dev/null and b/windows/manage/images/cortana-powerbi-retail-analysis-dataset.png differ
diff --git a/windows/manage/images/cortana-powerbi-retail-analysis-sample.png b/windows/manage/images/cortana-powerbi-retail-analysis-sample.png
new file mode 100644
index 0000000000..e3b61dcaa2
Binary files /dev/null and b/windows/manage/images/cortana-powerbi-retail-analysis-sample.png differ
diff --git a/windows/manage/images/cortana-powerbi-search.png b/windows/manage/images/cortana-powerbi-search.png
new file mode 100644
index 0000000000..88a8b40296
Binary files /dev/null and b/windows/manage/images/cortana-powerbi-search.png differ
diff --git a/windows/manage/images/cortana-powerbi-settings.png b/windows/manage/images/cortana-powerbi-settings.png
new file mode 100644
index 0000000000..0f51229895
Binary files /dev/null and b/windows/manage/images/cortana-powerbi-settings.png differ
diff --git a/windows/manage/images/cortana-redmond-weather.png b/windows/manage/images/cortana-redmond-weather.png
new file mode 100644
index 0000000000..7e8adc1929
Binary files /dev/null and b/windows/manage/images/cortana-redmond-weather.png differ
diff --git a/windows/manage/images/cortana-reminder-edit.png b/windows/manage/images/cortana-reminder-edit.png
new file mode 100644
index 0000000000..79cc280947
Binary files /dev/null and b/windows/manage/images/cortana-reminder-edit.png differ
diff --git a/windows/manage/images/cortana-reminder-list.png b/windows/manage/images/cortana-reminder-list.png
new file mode 100644
index 0000000000..1f57fc0f05
Binary files /dev/null and b/windows/manage/images/cortana-reminder-list.png differ
diff --git a/windows/manage/images/cortana-reminder-mic.png b/windows/manage/images/cortana-reminder-mic.png
new file mode 100644
index 0000000000..46a18e8e0b
Binary files /dev/null and b/windows/manage/images/cortana-reminder-mic.png differ
diff --git a/windows/manage/images/cortana-reminder-pending-mic.png b/windows/manage/images/cortana-reminder-pending-mic.png
new file mode 100644
index 0000000000..159d408e0a
Binary files /dev/null and b/windows/manage/images/cortana-reminder-pending-mic.png differ
diff --git a/windows/manage/images/cortana-reminder-pending.png b/windows/manage/images/cortana-reminder-pending.png
new file mode 100644
index 0000000000..a6b64b5621
Binary files /dev/null and b/windows/manage/images/cortana-reminder-pending.png differ
diff --git a/windows/manage/images/cortana-send-email-coworker-mic.png b/windows/manage/images/cortana-send-email-coworker-mic.png
new file mode 100644
index 0000000000..0cfa8fb731
Binary files /dev/null and b/windows/manage/images/cortana-send-email-coworker-mic.png differ
diff --git a/windows/manage/images/cortana-send-email-coworker.png b/windows/manage/images/cortana-send-email-coworker.png
new file mode 100644
index 0000000000..40ce18bdca
Binary files /dev/null and b/windows/manage/images/cortana-send-email-coworker.png differ
diff --git a/windows/manage/images/cortana-weather-multipanel.png b/windows/manage/images/cortana-weather-multipanel.png
new file mode 100644
index 0000000000..e8db031744
Binary files /dev/null and b/windows/manage/images/cortana-weather-multipanel.png differ
diff --git a/windows/manage/images/wufb-config1a.png b/windows/manage/images/wufb-config1a.png
index 44ce007a76..1514b87528 100644
Binary files a/windows/manage/images/wufb-config1a.png and b/windows/manage/images/wufb-config1a.png differ
diff --git a/windows/manage/images/wufb-config2.png b/windows/manage/images/wufb-config2.png
index 0ab09d4868..f54eef9a50 100644
Binary files a/windows/manage/images/wufb-config2.png and b/windows/manage/images/wufb-config2.png differ
diff --git a/windows/manage/images/wufb-config3a.png b/windows/manage/images/wufb-config3a.png
index a76d1569be..538028cfdc 100644
Binary files a/windows/manage/images/wufb-config3a.png and b/windows/manage/images/wufb-config3a.png differ
diff --git a/windows/manage/manage-cortana-in-enterprise.md b/windows/manage/manage-cortana-in-enterprise.md
index 5fb13a4fac..33b7160191 100644
--- a/windows/manage/manage-cortana-in-enterprise.md
+++ b/windows/manage/manage-cortana-in-enterprise.md
@@ -1,84 +1,5 @@
---
title: Cortana integration in your business or enterprise (Windows 10)
description: The world’s first personal digital assistant helps users get things done, even at work. Cortana includes powerful configuration options specifically to optimize for unique small to medium-sized business and enterprise environments.
-ms.assetid: db7b05da-186f-4628-806a-f8b134e2af2c
-ms.prod: w10
-ms.mktglfcycl: manage
-ms.sitesec: library
-author: eross-msft
-localizationpriority: high
----
-
-# Cortana integration in your business or enterprise
-**Applies to:**
-
-- Windows 10
-- Windows 10 Mobile
-
->Learn more about what features and functionality are supported in each Windows edition at [Compare Windows 10 Editions](https://www.microsoft.com/en-us/WindowsForBusiness/Compare).
-
-The world’s first personal digital assistant helps users get things done, even at work. Cortana includes powerful configuration options specifically to optimize for unique small to medium-sized business and enterprise environments.
-
-## Cortana integration with Office 365
-Cortana in Windows 10 is already great at letting your employees quickly see what the day is going to look like, see where and when their meetings are going to be, get a sense of travel times to and from work, and even get updates from a calendar for upcoming trips.
-
-But Cortana works even harder when she connects to Office 365, helping employees prepare for meetings, learn about co-workers, and receive reminders about where they need to be so they won’t be late.
-
->**Important**
->Before your employees can use Cortana with Office 365, they must sign into Cortana using a Microsoft account (such as, @outlook.com), and then they must go to the **Connected Accounts** section of Cortana’s notebook to turn on and connect to Office 365.
-
-
-**More info:**
-
-- For specific info about what you need to know as a company administrator, including how to turn off Cortana with Office 365, see the [Cortana integration with Office 365](https://go.microsoft.com/fwlink/p/?LinkId=717378) support topic.
-
-- For a quick review of the frequently asked questions about Cortana and Office 365 integration, see the blog post, [An early look at Cortana integration with Office 365](https://go.microsoft.com/fwlink/p/?LinkId=717379).
-
-## Cortana and Power BI
-Integration between Cortana and Power BI shows how Cortana can work with custom business analytics solutions to enable you to get answers directly from your key business data, including introducing new features that let you create custom Cortana answers using the full capabilities of Power BI Desktop.
-
-**More info:**
-
-- For specific info about how to start using Power BI and Cortana integration, how to customize your data results, and how to use the “Hey Cortana” functionality, see the [Power BI: Announcing Power BI integration with Cortana and new ways to quickly find insights in your data](https://go.microsoft.com/fwlink/p/?LinkId=717382) blog.
-
-## Cortana and Microsoft Dynamics CRM
-Cortana integration is a Preview feature that's available for your test or dev environment, starting with the CRM Online 2016 Update. If you decide to use this Preview feature, you'll need to turn in on and accept the license terms. After that, salespeople will get proactive insights from Cortana on important CRM activities, including sales leads, accounts, and opportunities; presenting the most relevant info at any given time.
-
-**More info:**
-- For more info about Preview features, see [What are Preview features and how do I enable them?](https://go.microsoft.com/fwlink/p/?LinkId=746817).
-- For more info about Cortana, see [What is Cortana?](https://go.microsoft.com/fwlink/p/?LinkId=746818).
-- For more info about CRM integration, how to turn on Cortana, and how to provide feedback, see [Preview feature: Set up Cortana integration](https://go.microsoft.com/fwlink/p/?LinkId=746819).
-
-## Cortana and privacy
-We understand that there are concerns about Cortana and enterprise privacy, so we’ve put together the [Cortana, Search, and privacy: FAQ](https://go.microsoft.com/fwlink/p/?LinkId=717383) topic that covers many of the frequently asked questions. These questions include things such as what info is collected by Cortana, where the info is saved, how to manage what data is collected, how to turn Cortana off, how to opt completely out of data collection, and what info is shared with other Microsoft apps and services.
-
-## Set up Cortana using Group Policy and MDM policies
-Set up and manage Cortana by using the following Group Policy and mobile device management (MDM) policies.
-
-|Group policy |MDM policy |Description |
-|-------------|-----------|------------|
-|Computer Configuration\Administrative Templates\Windows Components\Search\AllowCortanaAboveLock |AboveLock/AllowCortanaAboveLock |Specifies whether an employee can interact with Cortana using voice commands when the system is locked.
**Note**
This setting only applies to Windows 10 for desktop devices. |
-|Computer Configuration\Administrative Templates\Control Panel\Regional and Language Options\Allow input personalization |Privacy/AllowInputPersonalization |Specifies whether an employee can use voice commands with Cortana in the enterprise.
**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. |
-|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. |
-|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. |
-
-**More info:**
-- For specific info about how to set, manage, and use each of these MDM policies to configure Cortana in your enterprise, see the [Policy CSP](https://go.microsoft.com/fwlink/p/?LinkId=717380) topic, located in the configuration service provider reference topics. For specific info about how to set, manage, and use each of these Group Policies to configure Cortana in your enterprise, see the [Group Policy TechCenter](https://go.microsoft.com/fwlink/p/?LinkId=717381).
-
-## Related topics
-- [Cortana and Windows](https://go.microsoft.com/fwlink/p/?LinkId=717384)
-- [Cortana for developers](https://go.microsoft.com/fwlink/p/?LinkId=717385)
-
-
-
-
-
-
-
-
-
+redirect_url: https://technet.microsoft.com/en-us/itpro/windows/manage/cortana-at-work-overview
+---
\ No newline at end of file
diff --git a/windows/manage/waas-integrate-wufb.md b/windows/manage/waas-integrate-wufb.md
index d00083ad6c..bf9f2ebf78 100644
--- a/windows/manage/waas-integrate-wufb.md
+++ b/windows/manage/waas-integrate-wufb.md
@@ -23,10 +23,10 @@ You can integrate Windows Update for Business deployments with existing manageme
## Integrate Windows Update for Business with Windows Server Update Services
-For Windows 10, version 1607, devices can now be configured to receive updates from both Windows Update and Windows Server Update Services (WSUS). In a joint WSUS and Windows Update for Business setup:
+For Windows 10, version 1607, devices can now be configured to receive updates from both Windows Update (or Microsoft Update) and Windows Server Update Services (WSUS). In a joint WSUS and Windows Update for Business setup:
- Devices will receive their Windows content from Microsoft and defer these updates according to Windows Update for Business policy
-- All other content synced from WSUS will be directly applied to the device; that is, non-Windows Updates content will not follow your Windows Update for Business deferral policies
+- All other content synced from WSUS will be directly applied to the device; that is, updates to products other than Windows will not follow your Windows Update for Business deferral policies
### Configuration example \#1: Deferring Windows Update updates with other update content hosted on WSUS
@@ -34,13 +34,13 @@ For Windows 10, version 1607, devices can now be configured to receive updates f
- Device is configured to defer Windows Quality Updates using Windows Update for Business
- Device is also configured to be managed by WSUS
-- Device is not configured to include Microsoft Updates from Windows Update (**Update/AllowMUUpdateService** = not enabled)
-- Admin has opted to put Microsoft updates on WSUS
+- Device is not configured to enable Microsoft Update (**Update/AllowMUUpdateService** = not enabled)
+- Admin has opted to put updates to Office and other products on WSUS
- Admin has also put 3rd party drivers on WSUS
| Content | Metadata source | Payload source | Deferred? | - |
|---|---|---|---|---|
| Windows Update | Windows Update | Windows Update | Yes |  |
| Microsoft Update (such as Office updates) | WSUS | WSUS | No | |
| Updates to Windows | Windows Update | Windows Update | Yes |  |
| Updates to Office and other products | WSUS | WSUS | No | |
| Third-party drivers | WSUS | WSUS | No |
| Content | Metadata source | Payload source | Deferred? | - |
|---|---|---|---|---|
| Windows Update (exclude driver) | Windows Update | Windows Update | Yes |  |
| Windows Update drivers | WSUS | WSUS | No | |
| Microsoft Update (such as Office updates) | WSUS | WSUS | No | |
| Windows drivers, third-party drivers | WSUS | WSUS | No | |
| Updates to Windows (excluding drivers) | Windows Update | Windows Update | Yes |  |
| Updates to Office and other products | WSUS | WSUS | No | |
| Drivers | WSUS | WSUS | No |
| Content | Metadata source | Payload source | Deferred? | - |
|---|---|---|---|---|
| Windows Update (exclude drivers) | Windows Update | Windows Update | Yes |  |
| Microsoft Update (such as Office updates) | Microsoft Update | Microsoft Update | No | |
| Drivers, third-party | WSUS | WSUS | No | |
| Updates to Windows (excluding drivers) | Microsoft Update | Microsoft Update | Yes |  |
| Updates to Office and other products | Microsoft Update | Microsoft Update | No | |
| Drivers, third-party applications | WSUS | WSUS | No |