Skip to content

Commit 1b561d3

Browse files
Merge branch 'main' into repo-health-check-Q1
2 parents 2fe3965 + 439b5bc commit 1b561d3

232 files changed

Lines changed: 2281 additions & 1215 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/AutoLabelMsftContributor.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,5 @@ jobs:
3131
PayloadJson: ${{ needs.download-payload.outputs.WorkflowPayload }}
3232
secrets:
3333
AccessToken: ${{ secrets.GITHUB_TOKEN }}
34-
TeamReadAccessToken: ${{ secrets.ORG_READTEAMS_TOKEN }}
34+
ClientId: ${{ secrets.M365_APP_CLIENT_ID }}
35+
PrivateKey: ${{ secrets.M365_APP_PRIVATE_KEY }}

.github/workflows/M365Endpoints.yml

Lines changed: 203 additions & 74 deletions
Large diffs are not rendered by default.

.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/max-cpub-test/.github/workflows/Shared-StaleBranch.yml@main
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: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1315,6 +1315,11 @@
13151315
"redirect_url": "/microsoft-365/admin/support-contact-info",
13161316
"redirect_document_id": false
13171317
},
1318+
{
1319+
"source_path": "microsoft-365/admin/support-contact-info.md",
1320+
"redirect_url": "https://support.microsoft.com/topic/customer-service-phone-numbers-c0389ade-5640-e588-8b0e-28de8afeb3f2#ID0EBBD=signinorgid",
1321+
"redirect_document_id": false
1322+
},
13181323
{
13191324
"source_path": "microsoft-365/admin/misc/sign-up-for-online-services.md",
13201325
"redirect_url": "/microsoft-365/admin/misc/remove-a-domain-from-another-account",
@@ -2204,6 +2209,16 @@
22042209
"source_path": "microsoft-365/admin/misc/admin-controls-profile-videos.md",
22052210
"redirect_url": "/microsoft-365/admin/add-users/change-user-profile-photos.md",
22062211
"redirect_document_id": false
2207-
}
2212+
},
2213+
{
2214+
"source_path": "microsoft-365/admin/manage/change-contact-preferences.md",
2215+
"redirect_url": "/microsoft-365/admin/manage/change-address-contact-and-more",
2216+
"redirect_document_id": false
2217+
},
2218+
{
2219+
"source_path": "microsoft-365/admin/manage/use-qr-code-download-outlook.md",
2220+
"redirect_url": "https://go.microsoft.com/fwlink/?linkid=2309759",
2221+
"redirect_document_id": false
2222+
}
22082223
]
22092224
}

.openpublishing.redirection.enterprise.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1424,6 +1424,11 @@
14241424
"source_path": "microsoft-365/enterprise/tune-microsoft-365-performance.md",
14251425
"redirect_url": "/microsoft-365/enterprise/index",
14261426
"redirect_document_id": false
1427+
},
1428+
{
1429+
"source_path": "microsoft-365/enterprise/contoso-win10.md",
1430+
"redirect_url": "/microsoft-365/enterprise/contoso-win11",
1431+
"redirect_document_id": false
14271432
}
14281433
]
14291434
}

.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.
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
---
2+
author: MandiOhlinger
3+
ms.author: mandia
4+
manager: laurawi
5+
ms.reviewer: cabailey
6+
ms.service: microsoft-365-copilot
7+
ms.topic: include
8+
description: Create default Microsoft Purview sensitivity labels for Microsoft 365 Copilot.
9+
ms.date: 03/06/2025
10+
---
11+
12+
1. Sign into the [Microsoft Purview portal](https://purview.microsoft.com/) as an admin in one of the groups listed at [Sensitivity labels - permissions](/purview/get-started-with-sensitivity-labels#permissions-required-to-create-and-manage-sensitivity-labels).
13+
14+
2. Select **Solutions** > **DSPM for AI** > **Overview**.
15+
3. In the **Recommendations** section, select **Information Protection Policy for Sensitivity Labels**. This step creates the default labels and their policies.
16+
4. To see or edit the default labels, or to create your own labels, select **Information protection** > **Sensitivity labels**. You might have to select **Refresh**.
17+
18+
When you have the default sensitivity labels:
19+
20+
- The labels help protect your data and can affect Copilot results.
21+
- Your users can start manually applying published labels to their files and emails.
22+
- Admins can start creating policies and configuring features that automatically apply labels to files and emails.
23+
24+
At any time, you can create your own sensitivity labels. To learn more, see [Create and configure sensitivity labels and their policies](/purview/create-sensitivity-labels).
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
---
2+
author: MandiOhlinger
3+
ms.author: mandia
4+
manager: laurawi
5+
ms.reviewer: cabailey
6+
ms.service: microsoft-365-copilot
7+
ms.topic: include
8+
description: Enable and configure sensitivity labels for containers that affect Microsoft 365 Copilot.
9+
ms.date: 03/06/2025
10+
---
11+
12+
Instead, the label settings can restrict access to the container. This restriction provides an extra layer of security when you use Copilot. If a user can't access the site or workspace, Copilot can't access it on behalf of that user.
13+
14+
For example, you can set the privacy setting to **Private**, which restricts site access to only approved members in your organization. When the label is applied to the site, it replaces any previous setting and locks the site for as long as the label is applied. This feature is a more secure setting than letting anybody access the site and allowing users to change the setting. When only approved members can access the data, it helps prevent oversharing of data that Copilot might access.
15+
16+
To configure any label settings for groups and sites, you must enable this feature in your tenant and then synchronize your labels. This configuration is a one-time configuration and uses PowerShell. To learn more, see [How to enable sensitivity labels for containers and synchronize labels](/purview/sensitivity-labels-teams-groups-sites#how-to-enable-sensitivity-labels-for-containers-and-synchronize-labels).
17+
18+
You can then edit your sensitivity labels, or create new sensitivity labels specifically for groups and sites:
19+
20+
1. For the sensitivity label scope, select **Groups & sites**. Remember, you must have already run the PowerShell commands. If you didn't, you can't select this scope.
21+
22+
To learn more, see [How to enable sensitivity labels for containers and synchronize labels](/purview/sensitivity-labels-teams-groups-sites#how-to-enable-sensitivity-labels-for-containers-and-synchronize-labels).
23+
24+
2. Select the groupings of settings to configure. Some of the settings have backend dependencies before they can be enforced, like Conditional Access that must be already configured. The privacy setting, which is included in **Privacy and external user access settings**, doesn't have any backend dependencies.
25+
26+
3. Configure the settings you want to use and save your changes.
27+
28+
For more information, including details of all the available label settings that you can configure for groups and sites, see [Use sensitivity labels to protect content in Microsoft Teams, Microsoft 365 groups, and SharePoint sites](/purview/sensitivity-labels-teams-groups-sites).

0 commit comments

Comments
 (0)