Skip to content

Commit dfb6d4b

Browse files
authored
Merge branch 'public' into patch-1
2 parents ba6a93d + 349298a commit dfb6d4b

2,888 files changed

Lines changed: 8251 additions & 176940 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.openpublishing.redirection.admin.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1675,6 +1675,11 @@
16751675
"redirect_url": "/microsoft-365/admin/get-help-with-domains/change-nameservers-at-any-domain-registrar",
16761676
"redirect_document_id": false
16771677
},
1678+
{
1679+
"source_path": "microsoft-365/admin/dns/create-dns-records-at-1-1-internet.md",
1680+
"redirect_url": "/microsoft-365/admin/dns/create-dns-records-at-ionos-com",
1681+
"redirect_document_id": true
1682+
},
16781683
{
16791684
"source_path": "microsoft-365/admin/dns/change-nameservers-at-aws.md",
16801685
"redirect_url": "/microsoft-365/admin/get-help-with-domains/change-nameservers-at-any-domain-registrar",

.openpublishing.redirection.security.json

Lines changed: 5361 additions & 1 deletion
Large diffs are not rendered by default.

copilot/TOC.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,23 @@
55
href: microsoft-365-copilot-setup.md
66
- name: Plan
77
items:
8-
- name: Overview of Microsoft Copilot for Microsoft 365
8+
- name: Overview of Copilot for Microsoft 365
99
href: microsoft-365-copilot-overview.md
10-
- name: Requirements for Microsoft Copilot for Microsoft 365
10+
- name: Requirements for Copilot for Microsoft 365
1111
href: microsoft-365-copilot-requirements.md
1212
- name: Data, Privacy, and Security for Copilot for Microsoft 365
1313
href: microsoft-365-copilot-privacy.md
1414
- name: Zero Trust principles for Microsoft Copilot for Microsoft 365
1515
href: /security/zero-trust/zero-trust-microsoft-365-copilot
16-
- name: Extend Microsoft Copilot for Microsoft 365
16+
- name: Extend Copilot for Microsoft 365
1717
href: /microsoftteams/platform/copilot/how-to-extend-copilot
1818
- name: Deploy
1919
items:
20-
- name: Enable users for Microsoft Copilot for Microsoft 365
20+
- name: Enable users for Copilot for Microsoft 365
2121
href: microsoft-365-copilot-enable-users.md
2222
- name: Manage
2323
items:
24-
- name: Microsoft Copilot for Microsoft 365 usage report
24+
- name: Copilot for Microsoft 365 usage report
2525
href: /microsoft-365/admin/activity-reports/microsoft-365-copilot-usage
2626
- name: Plugins for Copilot in Integrated Apps
2727
href: /microsoft-365/admin/manage/manage-plugins-for-copilot-in-integrated-apps

copilot/copilot-for-microsoft-365-admin.md

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ ms.collection:
1717
- Adm_O365
1818
- Adm_TOC
1919
- m365copilot
20+
- magic-ai-copilot
2021
ROBOTS: NOINDEX, NOFOLLOW
2122
description: "Learn about Copilot for Microsoft 365 admin and how it can help simplify admin tasks."
2223
---
@@ -47,48 +48,48 @@ With Copilot for Microsoft 365 admin, you can:
4748

4849
As an example, check out these prompts:
4950

50-
- Show me users in Australia with Teams license assigned
51-
- Identify all groups in my organization without an owner
52-
- Identify all users who are unlicensed"
51+
- "Show me users in Australia with Teams license assigned"
52+
- "Identify all groups in my organization without an owner"
53+
- "Identify all users who are unlicensed"
5354

5455
**Navigate** to different pages, features, and experiences within the admin center. Copilot provides a breadcrumb trail and direct link to your desired page.
5556

5657
Examples:
5758

58-
- Where do I manage integrated apps
59-
- Where do I manage roles
59+
- "Where do I manage integrated apps"
60+
- "Where do I manage roles"
6061

6162
**Get support** for any challenges or questions that you have related to administering Microsoft 365 for your tenant.
6263

6364
Examples:
6465

65-
- How do I view my bill?
66-
- How do I set up Multi-factor Authentication?
66+
- "How do I view my bill?"
67+
- "How do I set up Multi-factor Authentication?"
6768

6869
Provide **deployment guidance** for setting up and managing various aspects of identity and security within the tenant.
6970

7071
Examples:
7172

72-
- What is the status of my security defaults?
73-
- What is the identity user status in my org?
73+
- "What is the status of my security defaults?"
74+
- "What is the identity user status in my org?"
7475

75-
**Surface general status** of Microsoft services, tenant health status, health advice and recommendations.
76+
**Surface general status** of Microsoft services, tenant health status, health advice, and recommendations.
7677

7778
Examples:
7879

79-
- "Are there any service issues right now?
80-
- Show me health of teams
80+
- "Are there any service issues right now?"
81+
- "Show me health of teams"
8182

8283
**Marketplace navigation** to help admins discover, trial, or purchase solutions and take advantage of value from Microsoft 365.
8384

8485
Examples:
8586

86-
- Tell me about Microsoft Business Premium
87-
- I want to buy Visio
87+
- "Tell me about Microsoft Business Premium"
88+
- "I want to buy Visio"
8889

89-
During the preview, use the pre-populated prompt options in the Copilot pane for the best results.
90+
During the preview, use the prepopulated prompt options in the Copilot pane for the best results.
9091

91-
To maintain your security and privacy, Copilot won't make any configuration changes on behalf of you. To learn more about security and privacy with Copilot, see [Data, Privacy, and Security for Microsoft 365 Copilot](microsoft-365-copilot-privacy.md).
92+
To maintain your security and privacy, Copilot doesn't make any configuration changes on your behalf. To learn more about security and privacy with Copilot, see [Data, Privacy, and Security for Microsoft 365 Copilot](microsoft-365-copilot-privacy.md).
9293

9394
## Frequently Asked Questions
9495

@@ -98,7 +99,7 @@ In preview, Copilot is automatically enabled for select customers who have purch
9899

99100
### Which admin roles can use Copilot for Microsoft 365 admin?
100101

101-
It will be available to all admins, and respect role-based access controls (RBAC) within the admin center, only surfacing information and controls that the particular admin has access to. Copilot won't make any configuration changes on behalf of an admin, keeping security integrity intact.
102+
It will be available to all admins, and respect role-based access controls (RBAC) within the admin center, only surfacing information and controls that the particular admin has access to. Copilot doesn't make any configuration changes on behalf of an admin, keeping security integrity intact.
102103

103104
### Are there differences with how Copilot treats prompts from the admin center or admin vs. Users?
104105

copilot/index.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ metadata:
1212
ms.collection:
1313
- essentials-navigation
1414
- m365copilot
15+
- magic-ai-copilot
1516
author: samanro #Required; your GitHub user alias, with correct capitalization.
1617
ms.author: samanro #Required; microsoft alias of author; optional team alias.
1718
ms.date: 09/21/2023 #Required; mm/dd/yyyy format.
@@ -64,7 +65,7 @@ additionalContent:
6465
url: microsoft-365-copilot-privacy.md
6566
- text: Zero trust illustrations
6667
url: /security/zero-trust/zero-trust-tech-illus#zero-trust-for-microsoft-365-copilot
67-
- text: Microsoft Purview data security and compliance protections for Microsoft Copilot
68+
- text: Microsoft Purview data security and compliance protections for generative AI apps
6869
url: /purview/ai-microsoft-purview
6970
- text: Isolation controls
7071
url: /compliance/assurance/assurance-microsoft-365-isolation-controls
@@ -105,6 +106,15 @@ additionalContent:
105106
url: https://copilot.cloud.microsoft
106107
# - text: Use additional data sources with Microsoft 365 Chat
107108
# url: https://go.microsoft.com/fwlink/?linkid=2250210
109+
# Card
110+
- title: Enable Copilot in Viva
111+
links:
112+
- text: Microsoft Copilot Dashboard in Viva Insights
113+
url: /viva/insights/org-team-insights/copilot-dashboard
114+
- text: Set up Copilot in Viva Engage
115+
url: /viva/engage/configure-copilot-for-engage
116+
- text: Enable Copilot in Viva Goals
117+
url: /viva/goals/copilot-intro
108118

109119
- title: Develop Copilot plugins and connectors for Microsoft 365
110120
items:

copilot/manage-public-web-access.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ ms.collection:
1717
- Adm_O365
1818
- Adm_TOC
1919
- m365copilot
20+
- magic-ai-copilot
2021
description: "Learn how to manage Microsoft Copilot for Microsoft 365 access to web content for your organization."
2122
---
2223

copilot/microsoft-365-copilot-enable-users.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ ms.collection:
1717
- Adm_O365
1818
- Adm_TOC
1919
- m365copilot
20+
- magic-ai-copilot
2021
description: "Learn about the steps to deploy Microsoft Copilot for Microsoft 365 to your users."
2122
---
2223

copilot/microsoft-365-copilot-overview.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ ms.collection:
1717
- Adm_O365
1818
- Adm_TOC
1919
- m365copilot
20+
- magic-ai-copilot
2021
- essentials-overview
2122
description: "Learn about how Microsoft Copilot for Microsoft 365 works."
2223
---

copilot/microsoft-365-copilot-page.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ ms.collection:
1717
- Adm_O365
1818
- Adm_TOC
1919
- m365copilot
20+
- magic-ai-copilot
2021
description: "Learn about the Copilot page and how you can manage Copilot for Microsoft 365 settings in the Microsoft 365 admin center."
2122
---
2223

copilot/microsoft-365-copilot-privacy.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@ ms.collection:
1111
- privacy-microsoft365
1212
- privacy-copilot
1313
- m365copilot
14+
- magic-ai-copilot
1415
hideEdit: true
15-
ms.date: 03/04/2024
16+
ms.date: 05/09/2024
1617
---
1718

1819
# Data, Privacy, and Security for Microsoft Copilot for Microsoft 365
@@ -54,7 +55,7 @@ Microsoft Copilot for Microsoft 365 provides value by connecting LLMs to your or
5455
5556
Microsoft Copilot for Microsoft 365 only surfaces organizational data to which individual users have at least view permissions. It's important that you're using the permission models available in Microsoft 365 services, such as SharePoint, to help ensure the right users or groups have the right access to the right content within your organization. This includes permissions you give to users outside your organization through inter-tenant collaboration solutions, such as [shared channels in Microsoft Teams](/microsoftteams/shared-channels).
5657

57-
When you enter prompts using Microsoft Copilot for Microsoft 365, the information contained within your prompts, the data they retrieve, and the generated responses remain within the Microsoft 365 service boundary, in keeping with our current privacy, security, and compliance commitments. Microsoft Copilot for Microsoft 365 uses Azure OpenAI services for processing, not OpenAI’s publicly available services.
58+
When you enter prompts using Microsoft Copilot for Microsoft 365, the information contained within your prompts, the data they retrieve, and the generated responses remain within the Microsoft 365 service boundary, in keeping with our current privacy, security, and compliance commitments. Microsoft Copilot for Microsoft 365 uses Azure OpenAI services for processing, not OpenAI’s publicly available services. Azure Open AI doesn't cache customer content and Copilot modified prompts for Copilot for Microsoft 365.
5859

5960
> [!NOTE]
6061
> When using Microsoft Copilot for Microsoft 365, your organization’s data might leave the Microsoft 365 service boundary under the following circumstances:
@@ -74,7 +75,7 @@ When a user interacts with Microsoft Copilot for Microsoft 365 apps (such as Wor
7475
To view and manage this stored data, admins can use Content search or Microsoft Purview. Admins can also use Microsoft Purview to set retention policies for the data related to chat interactions with Copilot. For more information, see the following articles:
7576

7677
- [Overview of Content search](/purview/ediscovery-content-search-overview)
77-
- [Microsoft Purview data security and compliance protections for Microsoft Copilot](/purview/ai-microsoft-purview)
78+
- [Microsoft Purview data security and compliance protections for generative AI apps](/purview/ai-microsoft-purview)
7879
- [Learn about retention for Copilot for Microsoft 365](/purview/retention-policies-copilot)
7980

8081
For Microsoft Teams chats with Copilot, admins can also use [Microsoft Teams Export APIs](/microsoftteams/export-teams-content) to view the stored data.
@@ -146,7 +147,7 @@ For more information, see the following articles:
146147

147148
The permissions model within your Microsoft 365 tenant can help ensure that data won't unintentionally leak between users, groups, and tenants. Microsoft Copilot for Microsoft 365 presents only data that each individual can access using the same underlying controls for data access used in other Microsoft 365 services. Semantic Index honors the user identity-based access boundary so that the grounding process only accesses content that the current user is authorized to access. For more information, see Microsoft’s [privacy policy and service documentation](https://privacy.microsoft.com/).
148149

149-
When you have data that's encrypted by Microsoft Purview Information Protection, Microsoft Copilot for Microsoft 365 honors the usage rights granted to the user. This encryption can be applied by [sensitivity labels](/purview/sensitivity-labels) or by restricted permissions in Microsoft 365 apps by using Information Rights Management (IRM). For more information about using Microsoft Purview with Microsoft Copilot for Microsoft 365, see [Microsoft Purview data security and compliance protections for Microsoft Copilot](/purview/ai-microsoft-purview).
150+
When you have data that's encrypted by Microsoft Purview Information Protection, Microsoft Copilot for Microsoft 365 honors the usage rights granted to the user. This encryption can be applied by [sensitivity labels](/purview/sensitivity-labels) or by restricted permissions in Microsoft 365 apps by using Information Rights Management (IRM). For more information about using Microsoft Purview with Microsoft Copilot for Microsoft 365, see [Microsoft Purview data security and compliance protections for generative AI apps](/purview/ai-microsoft-purview).
150151

151152
We already implement multiple forms of protection to help prevent customers from compromising Microsoft 365 services and applications or gaining unauthorized access to other tenants or the Microsoft 365 system itself. Here are some examples of those forms of protection:
152153

0 commit comments

Comments
 (0)