Skip to content

Commit 3354e64

Browse files
authored
Merge branch 'main' into aljupudi-9889737-sendemailasgroup
2 parents d25b138 + 8885073 commit 3354e64

51 files changed

Lines changed: 792 additions & 561 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.

.github/workflows/StaleBranch-Test.yml

Lines changed: 0 additions & 167 deletions
This file was deleted.

.github/workflows/StaleBranch.yml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: (Scheduled) Stale branch removal
2+
3+
permissions:
4+
contents: write
5+
6+
on:
7+
schedule:
8+
- cron: "0 */12 * * *"
9+
10+
workflow_dispatch:
11+
12+
13+
jobs:
14+
15+
stale-branch:
16+
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-StaleBranch.yml@workflows-prod
17+
with:
18+
PayloadJson: ${{ toJSON(github) }}
19+
RepoBranchSkipList: '[
20+
"ExampleBranch1",
21+
"ExampleBranch2"
22+
]'
23+
ReportOnly: true
24+
secrets:
25+
AccessToken: ${{ secrets.GITHUB_TOKEN }}

.openpublishing.redirection.admin.json

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2204,6 +2204,16 @@
22042204
"source_path": "microsoft-365/admin/misc/admin-controls-profile-videos.md",
22052205
"redirect_url": "/microsoft-365/admin/add-users/change-user-profile-photos.md",
22062206
"redirect_document_id": false
2207-
}
2207+
},
2208+
{
2209+
"source_path": "microsoft-365/admin/manage/change-contact-preferences.md",
2210+
"redirect_url": "/microsoft-365/admin/manage/change-address-contact-and-more",
2211+
"redirect_document_id": false
2212+
},
2213+
{
2214+
"source_path": "microsoft-365/admin/manage/use-qr-code-download-outlook.md",
2215+
"redirect_url": "https://go.microsoft.com/fwlink/?linkid=2309759",
2216+
"redirect_document_id": false
2217+
}
22082218
]
22092219
}

.openpublishing.redirection.lighthouse.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,6 @@
1515
"redirect_url":"/microsoft-365/lighthouse/m365-lighthouse-deploy-standard-tenant-configurations-overview",
1616
"redirect_document_id":false
1717
},
18-
{
19-
"source_path":"microsoft-365/lighthouse/m365-lighthouse-create-customer-report.md",
20-
"redirect_url":"/microsoft-365/lighthouse/m365-lighthouse-tenants-page-overview",
21-
"redirect_document_id":false
22-
},
2318
{
2419
"source_path":"microsoft-365/lighthouse/m365-lighthouse-get-access-to-sales-advisor.md",
2520
"redirect_url":"/microsoft-365/lighthouse/m365-lighthouse-sales-advisor-overview",

copilot/TOC.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,16 @@ items:
4444
href: copilot-prompt-gallery.md
4545
- name: Adoption resources
4646
href: microsoft-365-copilot-enablement-resources.md
47+
- name: Pay-as-you-go for Microsoft 365 Copilot
48+
items:
49+
- name: Microsoft 365 Copilot pay-as-you-go overview
50+
href: pay-as-you-go/overview.md
51+
- name: Set up pay-as-you-go for Microsoft 365 Copilot Chat
52+
href: pay-as-you-go/setup.md
53+
- name: Meters for Microsoft 365 Copilot Chat pay-as-you-go
54+
href: pay-as-you-go/meters.md
55+
- name: View costs and billing for Microsoft 365 Copilot Chat pay-as-you-go
56+
href: pay-as-you-go/view-cost.md
4757
- name: Manage Microsoft 365 Copilot
4858
items:
4959
- name: Manage Microsoft 365 Copilot scenarios

copilot/enterprise-data-protection.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.collection:
1313
- m365copilot
1414
- magic-ai-copilot
1515
hideEdit: true
16-
ms.date: 02/25/2025
16+
ms.date: 03/13/2025
1717
---
1818

1919
# Enterprise data protection in Microsoft 365 Copilot and Microsoft 365 Copilot Chat
@@ -32,7 +32,7 @@ Use of Microsoft 365 Copilot and Microsoft 365 Copilot Chat involves prompts (en
3232

3333
- **We secure your data:** We help protect your data with [encryption](/purview/office-365-encryption-in-the-microsoft-cloud-overview) at rest and in transit, rigorous physical security controls, and data [isolation](/compliance/assurance/assurance-microsoft-365-isolation-controls) between tenants.
3434

35-
- **Your data is private:** We won’t use your data except as you instruct. Our commitments to [privacy](https://www.microsoft.com/trust-center/privacy) include support for [GDPR](/compliance/regulatory/gdpr), [ISO/IEC 27018](/compliance/regulatory/offering-ISO-27018), and our [Data Protection Addendum](https://www.microsoft.com/licensing/docs/view/Microsoft-Products-and-Services-Data-Protection-Addendum-DPA).
35+
- **Your data is private:** We won’t use your data except as you instruct. Our commitments to [privacy](https://www.microsoft.com/trust-center/privacy) include support for [GDPR](/compliance/regulatory/gdpr), the [EU Data Boundary](/privacy/eudb/eu-data-boundary-learn)<sup>[3]</sup>, [ISO/IEC 27018](/compliance/regulatory/offering-ISO-27018), and our [Data Protection Addendum](https://www.microsoft.com/licensing/docs/view/Microsoft-Products-and-Services-Data-Protection-Addendum-DPA).
3636

3737
- **Your access controls and policies apply to Copilot:** Copilot respects your [identity model](microsoft-365-copilot-privacy.md#how-does-microsoft-365-copilot-protect-organizational-data) and [permissions](microsoft-365-copilot-privacy.md#how-does-microsoft-365-copilot-use-your-proprietary-organizational-data), inherits your [sensitivity labels](/purview/sensitivity-labels#sensitivity-labels-and-microsoft-365-copilot), applies your [retention](/purview/retention-policies-copilot) policies, supports [audit](/purview/audit-search?tabs=microsoft-purview-portal) of interactions, and follows your administrative settings. The specific controls and policies will vary depending on the underlying subscription plan.
3838

@@ -57,7 +57,7 @@ In addition to prompts and responses, web search queries (different from Microso
5757

5858
- The Bing search service operates separately from Microsoft 365 and has different data-handling practices covered by the [Microsoft Services Agreement](https://www.microsoft.com/servicesagreement) between each user and Microsoft, together with the [Microsoft Privacy Statement](https://www.microsoft.com/privacy/privacystatement). The means that Microsoft acts as an independent data controller responsible for complying with all applicable laws and controller obligations. This approach is consistent with other [optional connected experiences that rely on Bing](/microsoft-365-apps/privacy/optional-connected-experiences#experiences-that-rely-on-bing).
5959

60-
- [Learn more about data, privacy, and security of web queries in Microsoft 365 Copilot and Microsoft 365 Copilot Chat](manage-public-web-access.md)
60+
- The [Product Terms](https://www.microsoft.com/licensing/terms/product/PrivacyandSecurityTerms/all) provide additional commitments about the web queries sent to the Bing search service. For more information, see [Data, privacy, and security for web search in Microsoft 365 Copilot and Microsoft 365 Copilot Chat](manage-public-web-access.md#how-microsoft-handles-generated-search-queries).
6161

6262
## Agents in Microsoft 365 Copilot
6363

@@ -67,4 +67,6 @@ When you’re using agents in Microsoft 365 Copilot, check the privacy statement
6767

6868
<sup>[1]</sup> The specific controls will vary depending on a customer's Microsoft subscription plans.
6969

70-
<sup>[2]</sup> Microsoft 365 Copilot and Microsoft 365 Copilot Chat support HIPAA compliance for properly configured implementations. HIPAA compliance doesn't apply to web search queries as they aren't covered by the DPA and BAA.
70+
<sup>[2]</sup> Microsoft 365 Copilot and Microsoft 365 Copilot Chat support HIPAA compliance for properly configured implementations. HIPAA compliance doesn't apply to web search queries as they aren't covered by the DPA and BAA.
71+
72+
<sup>[3]</sup> The EU Data Boundary doesn’t apply to web search queries.

copilot/manage-public-web-access.md

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.collection:
1313
- m365copilot
1414
- magic-ai-copilot
1515
hideEdit: true
16-
ms.date: 02/19/2025
16+
ms.date: 03/13/2025
1717
---
1818

1919
# Data, privacy, and security for web search in Microsoft 365 Copilot and Microsoft 365 Copilot Chat
@@ -44,7 +44,7 @@ When using Microsoft 365 Copilot, the generated search query doesn't include the
4444

4545
- When the user explicitly references a specific document in their prompt.
4646

47-
The user's prompts and Copilot's responses are stored within Microsoft 365 and never leave the service boundary for both Microsoft 365 Copilot and Microsoft 365 Copilot Chat.
47+
The user's prompts and Copilot's responses are stored within Microsoft 365 and never leave the service boundary for both Microsoft 365 Copilot and Microsoft 365 Copilot Chat without customer direction. [Enterprise data protection](enterprise-data-protection.md), the [Data Protection Addendum (DPA)](https://www.microsoft.com/licensing/docs/view/Microsoft-Products-and-Services-Data-Protection-Addendum-DPA), and the [Product Terms](https://www.microsoft.com/licensing/terms/product/PrivacyandSecurityTerms/all) apply to prompts and responses, with Microsoft acting as a data processor.
4848

4949
After Microsoft 365 Copilot and Microsoft 365 Copilot Chat receive additional information from the Bing search service, this information is used to compose the response returned to the user.
5050

@@ -87,13 +87,26 @@ The following table provides multiple examples of a user's prompt and the genera
8787

8888
Microsoft 365 Copilot and Microsoft 365 Copilot Chat both use generated search queries sent to the Bing search service to ground responses in web data. The way Microsoft handles these queries is identical in both services.
8989

90-
Generated search queries sent to the Bing search service have the user and tenant identifiers removed. They aren't shared with advertisers and aren’t used to train foundation large language models (LLMs). Also, web search queries sent to Bing don't affect any of the following:
90+
Generated search queries are sent to the Bing search service with user and tenant identifiers removed. Also, web search queries sent to Bing don't affect any of the following:
9191

9292
- Search Ranking
9393
- Answers or features like Rich Captions
9494
- Social features like Auto Suggest, Trending, and Zero Input
9595

96-
The Bing search service operates separately from Microsoft 365 and has different data-handling practices. The use of Bing is covered by the [Microsoft Services Agreement](https://www.microsoft.com/servicesagreement) between each user and Microsoft, together with the [Microsoft Privacy Statement](https://www.microsoft.com/privacy/privacystatement). The [Microsoft Products and Services Data Protection Addendum (DPA)](https://www.microsoft.com/licensing/docs/view/Microsoft-Products-and-Services-Data-Protection-Addendum-DPA) doesn't apply to the use of the **Web content** toggle in Microsoft 365 Copilot, Microsoft 365 Copilot Chat, or the Bing search service.
96+
The [Product Terms](https://www.microsoft.com/licensing/terms/product/PrivacyandSecurityTerms/all) provide the following additional commitments about the generated search queries sent to the Bing search service:
97+
98+
- Microsoft has no rights to them other than as needed to provide the service.
99+
- They aren’t used to improve Bing.
100+
- They aren’t used to create advertising profiles or to track user behavior.
101+
- They aren't shared with advertisers.
102+
- They aren’t used to train generative AI foundation models.
103+
- They are treated as customer confidential information and protected by appropriate technical and organizational measures.
104+
105+
The Bing search service operates separately from Microsoft 365 and has different data-handling practices. The web search queries generated by Copilot and sent to Bing are subject to the [Microsoft Services Agreement](https://www.microsoft.com/servicesagreement) between each user and Microsoft, together with the [Microsoft Privacy Statement](https://www.microsoft.com/privacy/privacystatement).
106+
107+
The [Product Terms](https://www.microsoft.com/licensing/terms/product/PrivacyandSecurityTerms/all) add additional commitments on Microsoft as a controller with respect to handling of web query data. Microsoft acts as a data controller, responsible for complying with all applicable laws and controller obligations. In the event of conflict with respect to the use of Bing with Microsoft 365 Copilot and Microsoft 365 Copilot Chat, the Product Terms supersede the Microsoft Services Agreement and the Microsoft Privacy Statement.
108+
109+
The [Microsoft Products and Services Data Protection Addendum (DPA)](https://www.microsoft.com/licensing/docs/view/Microsoft-Products-and-Services-Data-Protection-Addendum-DPA) doesn't apply to the use of generated web search queries in Microsoft 365 Copilot, Microsoft 365 Copilot Chat, or the Bing search service. Also, HIPAA compliance and the [EU Data Boundary](/privacy/eudb/eu-data-boundary-learn) don’t apply to generated search queries.
97110

98111
## Controls available to manage web search
99112

0 commit comments

Comments
 (0)