Skip to content

Commit f443b7b

Browse files
authored
Merge branch 'main' into M365-Endpoints
2 parents 5def4f4 + 7527453 commit f443b7b

34 files changed

Lines changed: 349 additions & 213 deletions

.github/workflows/M365Endpoints.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -565,7 +565,7 @@ jobs:
565565
function Write-ServiceAreaHeader {
566566
param($saName, $path, $file)
567567
568-
If ($saName -ne "") {
568+
If (($saName -ne "") -and ($saName -ne $Null)) {
569569
570570
Write-Host "Write service header for $saName"
571571
@@ -912,3 +912,4 @@ jobs:
912912

913913

914914

915+

.openpublishing.redirection.commerce.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -979,6 +979,11 @@
979979
"source_path": "microsoft-365/commerce/licenses/online-service-activation-faq.yml",
980980
"redirect_url": "/microsoft-365/commerce/licenses/online-service-activation-open-programs",
981981
"redirect_document_id": false
982+
},
983+
{
984+
"source_path": "microsoft-365/commerce/subscriptions/view-ramped-discount-subscriptions.md",
985+
"redirect_url": "/microsoft-365/commerce/index",
986+
"redirect_document_id": false
982987
}
983988
]
984989
}

copilot/TOC.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ items:
145145
href: microsoft-365-copilot-privacy.md
146146
- name: Data, privacy, and security for web search in Microsoft 365 Copilot and Microsoft 365 Copilot Chat
147147
href: manage-public-web-access.md
148-
- name: AI security for Microsoft 365 Copilot
148+
- name: Security for Microsoft 365 Copilot
149149
href: microsoft-365-copilot-ai-security.md
150150
- name: Apply principles of Zero Trust to Microsoft 365 Copilot
151151
href: /security/zero-trust/copilots/zero-trust-microsoft-365-copilot?toc=%2Fcopilot%2Fmicrosoft-365%2Ftoc.json&bc=%2Fcopilot%2Fmicrosoft-365%2Fbreadcrumb%2Ftoc.json
35.3 KB
Loading

copilot/microsoft-365-copilot-ai-security.md

Lines changed: 85 additions & 94 deletions
Large diffs are not rendered by default.

copilot/microsoft-365-copilot-licensing.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ To add Microsoft 365 Copilot to your Microsoft 365 subscription, you need one of
102102
- Visio Plan 2
103103

104104
- **Other plans:**
105-
- Microsoft ClipChamp
105+
- Microsoft Clipchamp
106106

107107
### Education Faculty and Higher Education Students Aged 18+ licenses
108108

@@ -120,12 +120,12 @@ The following plans are only available using [Enrollment for Education Solutions
120120
121121
## Microsoft 365 Copilot Chat
122122

123-
[Copilot Chat](/copilot/overview) is an AI prompt and response experience that's automatically included and available to organizations that have a Microsoft 365 subscription. There are two Copilot Chat options available: web-based chat and work-based chat.
123+
[Copilot Chat](/copilot/overview) is an AI prompt and response experience that's automatically included and available to organizations that have an [eligible Microsoft 365 subscription](/copilot/manage#microsoft-365--chat-eligibility). There are two Copilot Chat options available: web-based chat and work-based chat.
124124

125125
- Web-based chat:
126126

127127
- Shows results from the internet.
128-
- Automatically included in your Microsoft 365 subscription with no extra cost.
128+
- Automatically included with an [eligible Microsoft 365 subscription](/copilot/manage#microsoft-365--chat-eligibility) with no extra cost.
129129

130130
- Work-based chat:
131131

copilot/microsoft-365-copilot-overview.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ms.author: efrene
77
author: Efrene
88
ms.update-cycle: 180-days
99
manager: dansimp
10-
ms.date: 08/18/2025
10+
ms.date: 08/27/2025
1111
audience: Admin
1212
ms.reviewer: mandia
1313
ms.topic: overview
@@ -34,7 +34,10 @@ appliesto:
3434
>
3535
> GPT-5 is not yet available in [Microsoft 365 Copilot GCC](https://adoption.microsoft.com/en-us/copilot/gcc/).
3636
>
37-
> For more information, see the [Microsoft 365 Blog: Available today: GPT-5 in Microsoft 365 Copilot](https://www.microsoft.com/en-us/microsoft-365/blog/2025/08/07/available-today-gpt-5-in-microsoft-365-copilot/).
37+
> For more information, see the following articles:
38+
>
39+
> - [Microsoft 365 Blog: Available today -- GPT-5 in Microsoft 365 Copilot](https://www.microsoft.com/en-us/microsoft-365/blog/2025/08/07/available-today-gpt-5-in-microsoft-365-copilot/)
40+
> - [Understanding foundation model changes in Microsoft 365 Copilot](https://techcommunity.microsoft.com/blog/microsoft_365blog/understanding-foundation-model-changes-in-microsoft-365-copilot/4440322)
3841
3942
**Microsoft 365 Copilot is an AI-powered tool that helps with your work tasks**.
4043

copilot/microsoft-365-copilot-privacy.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ ms.collection:
1616
- trust-pod
1717
hideEdit: true
1818
ms.update-cycle: 180-days
19-
ms.date: 08/15/2025
19+
ms.date: 08/22/2025
2020
ms.custom: [copilot-learning-hub]
2121
---
2222

@@ -132,11 +132,13 @@ We already implement multiple forms of protection to help prevent customers from
132132

133133
## Meeting regulatory compliance requirements
134134

135-
As regulation in the AI space evolves, Microsoft will continue to adapt and respond to fulfill future regulatory requirements.
135+
Microsoft continues to adapt and respond to fulfill AI regulatory requirements as they evolve, so we earn and keep the trust of customers, partners, and regulators.
136136

137-
Microsoft 365 Copilot is built on top of Microsoft’s current commitments to data security and privacy in the enterprise. There's no change to these commitments. Microsoft 365 Copilot is integrated into Microsoft 365 and adheres to all existing privacy, security, and compliance commitments to Microsoft 365 commercial customers. For more information, see [Microsoft Compliance](/compliance).
137+
Microsoft 365 Copilot provides broad compliance offerings and certifications, including [GDPR](/compliance/regulatory/gdpr), [ISO 27001](/compliance/regulatory/offering-iso-27001), [HIPAA](/compliance/regulatory/offering-hipaa-hitech), and the [ISO 42001 standard for AI management systems](/compliance/regulatory/offering-iso-42001). These help support our customers on their compliance journeys, complemented by features such as contractual readiness, built-in information and communication technology risk management, and operational resilience tooling.
138138

139-
Beyond adhering to regulations, we prioritize an open dialogue with our customers, partners, and regulatory authorities to better understand and address concerns, thereby fostering an environment of trust and cooperation. We acknowledge that privacy, security, and transparency aren't just features, but prerequisites in the AI-driven landscape at Microsoft.
139+
Microsoft is committed to complying with all laws and regulations applicable to Microsoft, including the EU AI Act, to enable our AI solutions to meet evolving standards for trustworthy and responsible AI. Microsoft 365 Copilot is built on top of [Microsoft’s existing commitments to data security and privacy](https://www.microsoft.com/trust-center/privacy). There is no change to these commitments. Copilot is integrated into Microsoft 365 and adheres to existing privacy, security, and compliance commitments to Microsoft 365 customers.
140+
141+
Additionally, we prioritize open dialogue with our partners and regulatory authorities. We provide customers with direct access to Microsoft compliance professionals, proactive guidance, and curated solutions to help navigate regulatory compliance, such as the [Microsoft 365 Copilot & Copilot Chat Risk Assessment Quickstart](https://servicetrust.microsoft.com/DocumentPage/4fe5df86-848b-4097-b3fa-4625e2b8e8f2). Our approach in the AI-driven landscape aims to empower organizations to innovate confidently with solutions built with transparency, privacy, and security in mind.
140142

141143
## Additional information
142144

copilot/pin-copilot-chat-navbar.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,9 @@ To get to this setting, go to the [Copilot settings page](https://go.microsoft.c
5151

5252
Copilot Chat is pinned by default to the navigation bar of the Microsoft 365 apps and the Microsoft 365 Copilot app for most users eligible for Copilot Chat across web, mobile, and desktop.
5353

54+
> [!NOTE]
55+
> Copilot Chat is *not* pinned by default for users in the European Economic Area (EEA) and Switzerland.
56+
5457
Admins can change the pinning settings for Copilot Chat by selecting one of the following options under Settings on the Copilot Control System page in the [Microsoft 365 admin center](https://admin.microsoft.com/).
5558

5659
- **Pin Copilot Chat in Microsoft 365 apps (recommended)**: Copilot Chat is automatically pinned for all users. Users aren't prompted.
@@ -73,6 +76,10 @@ This setting is only applicable to users who have an active Intune license. To v
7376

7477
For more information, see [Pin Microsoft 365 Copilot app to the Windows taskbar](pin-copilot-taskbar.md).
7578

79+
If your organization doesn't have an Intune subscription, then you'll see the following page:
80+
81+
:::image type="content" source="media/pin-copilot-microsoft-365-no-intune.png" alt-text="Screenshot showing the link to pin Microsoft 365 Copilot app to the Windows taskbar if you don't have an Intune subscription.":::
82+
7683
## Pin at a group or user level
7784

7885
For large enterprises with complex needs, you can set up the Pinning policy to apply to specific groups of users. This option isn't recommended for most customers due to management complexity.

microsoft-365/admin/TOC.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,8 @@ items:
298298
href: activity-reports/microsoft-copilot-usage.md
299299
- name: Microsoft 365 Copilot Search usage
300300
href: activity-reports/microsoft-365-copilot-search-usage.md
301+
- name: Agent usage
302+
href: activity-reports/microsoft-365-copilot-agents-new.md
301303
- name: Message consumption
302304
href: activity-reports/message-consumption.md
303305
- name: Dynamics 365 Customer Voice activity

0 commit comments

Comments
 (0)