resolve the conflict

This commit is contained in:
huaping yu
2019-07-19 15:59:30 -07:00
17 changed files with 60 additions and 60 deletions

View File

@ -54,12 +54,12 @@ You must tell your employees to turn on Cortana before theyll be able to use
The employee can also disconnect by clicking **Disconnect** from the **Office 365** screen.
## Turn off Cortana with Office 365
Cortana can only access data in your Office 365 org when its turned on. If you dont want Cortana to access your corporate data, you can turn it off in the Office 365 admin center.
Cortana can only access data in your Office 365 org when its turned on. If you dont want Cortana to access your corporate data, you can turn it off in the Microsoft 365 admin center.
**To turn off Cortana with Office 365**
1. [Sign in to Office 365](https://www.office.com/signin) using your Azure AD account.
1. [Sign in to Office 365](https://www.office.com/signin) using your Azure AD account.
2. Go to the [Office 365 admin center](https://support.office.com/article/Office-365-admin-center-58537702-d421-4d02-8141-e128e3703547).
2. Go to the [admin center](https://support.office.com/article/Office-365-admin-center-58537702-d421-4d02-8141-e128e3703547).
3. Expand **Service Settings**, and select **Cortana**.