Skip to content

Commit 3c60a4d

Browse files
authored
Merge branch 'main' into docfx-update
2 parents 86a36e1 + 1f29596 commit 3c60a4d

71 files changed

Lines changed: 2523 additions & 1647 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.
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
name: (Scheduled) Auto issue assign
2+
3+
permissions:
4+
issues: write
5+
6+
on:
7+
# schedule:
8+
# - cron: "0 9 1 * *"
9+
10+
workflow_dispatch:
11+
12+
13+
jobs:
14+
15+
stale-branch:
16+
if: github.repository_owner == 'MicrosoftDocs'
17+
uses: MicrosoftDocs/max-cpub-test/.github/workflows/Shared-AutoIssueAssign.yml@main
18+
with:
19+
PayloadJson: ${{ toJSON(github) }}
20+
ExcludedUserList: '["user1", "user2"]'
21+
22+
23+
secrets:
24+
AccessToken: ${{ secrets.GITHUB_TOKEN }}
25+
PrivateKey: ${{ secrets.M365_APP_PRIVATE_KEY }}
26+
ClientId: ${{ secrets.M365_APP_CLIENT_ID }}

.openpublishing.redirection.admin.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2344,11 +2344,6 @@
23442344
"source_path": "microsoft-365/admin/manage/manage-embedded-knowledge-agents.md",
23452345
"redirect_url": "/microsoft-365/admin/manage/agent-registry#manage-agents-with-embedded-file-content-as-a-knowledge-source",
23462346
"redirect_document_id": false
2347-
},
2348-
{
2349-
"source_path": "copilot/connect-to-ai-models.md",
2350-
"redirect_url": "/copilot/microsoft-365/connect-to-ai-subprocessor",
2351-
"redirect_document_id": true
23522347
}
23532348
]
23542349
}

.openpublishing.redirection.copilot.json

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,13 @@
2121
"redirect_document_id": false
2222
},
2323
{
24-
"source_path": "copilot/microsoft-365/microsoft-365-early-access-program.yml",
25-
"redirect_url": "/copilot//microsoft-365/",
24+
"source_path": "copilot/microsoft-365-early-access-program.yml",
25+
"redirect_url": "/copilot/microsoft-365/",
26+
"redirect_document_id": false
27+
},
28+
{
29+
"source_path": "copilot/microsoft-365-copilot-transparency-note.md",
30+
"redirect_url": "/copilot/microsoft-365/microsoft-365-copilot-application-card",
2631
"redirect_document_id": false
2732
}
2833
]

.openpublishing.redirection.enterprise.json

Lines changed: 53 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1032,8 +1032,8 @@
10321032
},
10331033
{
10341034
"source_path":"microsoft-365/enterprise/move-sharepoint-between-geo-locations.md",
1035-
"redirect_url":"/microsoft-365/enterprise/m365-dr-workload-spo",
1036-
"redirect_document_id":true
1035+
"redirect_url":"/microsoft-365/enterprise/m365-dr-service-spo",
1036+
"redirect_document_id":false
10371037
},
10381038
{
10391039
"source_path":"microsoft-365/enterprise/lang-service-health.md",
@@ -1332,7 +1332,7 @@
13321332
},
13331333
{
13341334
"source_path": "microsoft-365/enterprise/move-onedrive-between-geo-locations.md",
1335-
"redirect_url": "/microsoft-365/enterprise/m365-dr-workload-spo#move-a-onedrive-site",
1335+
"redirect_url": "/microsoft-365/enterprise/m365-dr-service-spo#move-a-onedrive-site",
13361336
"redirect_document_id": false
13371337
},
13381338
{
@@ -1464,6 +1464,56 @@
14641464
"source_path": "microsoft-365/enterprise/configure-multi-geo-inregion-routing-preview.md",
14651465
"redirect_url": "/microsoft-365/enterprise/configure-multi-geo-in-region-routing",
14661466
"redirect_document_id": true
1467+
},
1468+
{
1469+
"source_path": "microsoft-365/enterprise/m365-dr-workload-exo.md",
1470+
"redirect_url": "/microsoft-365/enterprise/m365-dr-service-exo",
1471+
"redirect_document_id": true
1472+
},
1473+
{
1474+
"source_path": "microsoft-365/enterprise/m365-dr-workload-spo.md",
1475+
"redirect_url": "/microsoft-365/enterprise/m365-dr-service-spo",
1476+
"redirect_document_id": true
1477+
},
1478+
{
1479+
"source_path": "microsoft-365/enterprise/m365-dr-workload-teams.md",
1480+
"redirect_url": "/microsoft-365/enterprise/m365-dr-service-teams",
1481+
"redirect_document_id": true
1482+
},
1483+
{
1484+
"source_path": "microsoft-365/enterprise/m365-dr-workload-copilot.md",
1485+
"redirect_url": "/microsoft-365/enterprise/m365-dr-service-copilot",
1486+
"redirect_document_id": true
1487+
},
1488+
{
1489+
"source_path": "microsoft-365/enterprise/m365-dr-workload-mdo-p1.md",
1490+
"redirect_url": "/microsoft-365/enterprise/m365-dr-service-mdo-p1",
1491+
"redirect_document_id": true
1492+
},
1493+
{
1494+
"source_path": "microsoft-365/enterprise/m365-dr-workload-office-for-web.md",
1495+
"redirect_url": "/microsoft-365/enterprise/m365-dr-service-m365-web-apps",
1496+
"redirect_document_id": true
1497+
},
1498+
{
1499+
"source_path": "microsoft-365/enterprise/m365-dr-workload-m365-web-apps.md",
1500+
"redirect_url": "/microsoft-365/enterprise/m365-dr-service-m365-web-apps",
1501+
"redirect_document_id": false
1502+
},
1503+
{
1504+
"source_path": "microsoft-365/enterprise/m365-dr-workload-viva-connections.md",
1505+
"redirect_url": "/microsoft-365/enterprise/m365-dr-service-viva-connections",
1506+
"redirect_document_id": true
1507+
},
1508+
{
1509+
"source_path": "microsoft-365/enterprise/m365-dr-workload-purview.md",
1510+
"redirect_url": "/microsoft-365/enterprise/m365-dr-service-purview",
1511+
"redirect_document_id": true
1512+
},
1513+
{
1514+
"source_path": "microsoft-365/enterprise/m365-dr-workload-other.md",
1515+
"redirect_url": "/microsoft-365/enterprise/m365-dr-service-other",
1516+
"redirect_document_id": true
14671517
}
14681518
]
14691519
}

copilot/TOC.yml

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ items:
3232
href: pay-as-you-go/overview.md
3333
- name: Meters for pay-as-you-go
3434
href: pay-as-you-go/meters.md
35-
- name: Data, Privacy, and Security
35+
- name: Data, Privacy, Security, and Responsible AI
3636
items:
3737
- name: Data, privacy, and security for Microsoft 365 Copilot
3838
href: microsoft-365-copilot-privacy.md
@@ -48,18 +48,24 @@ items:
4848
href: /security/zero-trust/copilots/zero-trust-microsoft-365-copilot?toc=/copilot/microsoft-365/toc.json&bc=/copilot/microsoft-365/agent-framework/bread/toc.json
4949
- name: Enterprise data protection
5050
href: enterprise-data-protection.md
51-
- name: Transparency Note
52-
href: microsoft-365-copilot-transparency-note.md
51+
- name: Application card for Microsoft 365 Copilot
52+
href: microsoft-365-copilot-application-card.md
5353
- name: Privacy and protections
5454
href: /copilot/privacy-and-protections?toc=/copilot/microsoft-365/toc.json&bc=/copilot/microsoft-365/agent-framework/bread/toc.json
5555
- name: Copilot in Microsoft Edge
5656
href: /copilot/edge?toc=/copilot/microsoft-365/toc.json&bc=/copilot/microsoft-365/agent-framework/bread/toc.json
5757
- name: Implementation Readiness
5858
items:
59-
- name: Minimum requirements to deploy Microsoft 365 Copilot
60-
href: microsoft-365-copilot-minimum-requirements.md
61-
- name: Minimum requirements and consideration for Microsoft 365 Copilot Chat
62-
href: microsoft-365-copilot-chat-requirements.md
59+
- name: Minimum requirements and considerations for Microsoft 365 Copilot and Copilot Chat
60+
items:
61+
- name: Minimum requirements overview
62+
href: microsoft-365-copilot-minimum-requirements.md
63+
- name: Data and compliance readiness
64+
href: microsoft-365-copilot-minimum-requirements-data-compliance.md
65+
- name: Organization rollout
66+
href: microsoft-365-copilot-minimum-requirements-rollout.md
67+
- name: Minimum requirements for Microsoft 365 Copilot Chat
68+
href: microsoft-365-copilot-chat-requirements.md
6369
- name: Architecture & how Copilot works
6470
href: microsoft-365-copilot-architecture.md
6571
- name: Microsoft 365 Copilot Admin settings
@@ -101,6 +107,8 @@ items:
101107
items:
102108
- name: Anthropic as a subprocessor for Microsoft Online Services
103109
href: connect-to-ai-subprocessor.md
110+
- name: Connect to xAI's models
111+
href: connect-to-ai-models.md
104112
- name: Deploy Microsoft 365 Copilot app
105113
href: deploy-microsoft-365-copilot-app.md
106114
- name: Deploy Microsoft 365 Copilot app FAQ

copilot/connect-to-ai-models.md

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
---
2+
title: "Connect to xAI's models"
3+
ms.author: kwekua
4+
author: kwekuako
5+
ms.update-cycle: 180-days
6+
manager: scotv
7+
ms.date: 02/11/2026
8+
audience: Admin
9+
ms.topic: overview
10+
ms.service: microsoft-365-copilot
11+
ms.localizationpriority: medium
12+
ms.collection:
13+
- scotvorg
14+
- m365copilot
15+
- magic-ai-copilot
16+
- essentials-overview
17+
- operations-pod
18+
- OtherAILLMs
19+
appliesto:
20+
- ✅ Microsoft 365 Copilot
21+
description: "Learn about onboarding xAI for your Microsoft 365 organization."
22+
---
23+
24+
# Connect to xAI's models
25+
26+
You can now use xAI models within your Microsoft products. These models are hosted by xAI outside of Microsoft. You can elect to use XAI's models with Copilot Studio in Microsoft 365.
27+
28+
xAI models can help people in your organization with some of the following:
29+
30+
- Summarize complex information
31+
- Answer questions using source material
32+
- Synthesize across multiple sources
33+
- Idea generation, drafting and editing
34+
35+
When your organization chooses to use an xAI model, your organization is choosing to share your data with xAI to power Copilot Studio features. This data is processed outside all Microsoft managed environments and audit controls, therefore Microsoft’s customer agreements, including the [Product Terms](https://www.microsoft.com/licensing/terms?msockid=344e0e6ad66c6b3e19441848d7416abd) and [Data Processing Addendum](https://www.microsoft.com/licensing/docs/view/Microsoft-Products-and-Services-Data-Protection-Addendum-DPA?lang=18&msockid=344e0e6ad66c6b3e19441848d7416abd) don't apply. In addition, Microsoft’s data residency commitments, audit and compliance requirements, service level agreements, and Customer Copyright Commitment don't apply to your use of xAI services. Instead, use of xAI's services is governed by xAI’s [Terms of service](https://x.ai/legal/terms-of-service-enterprise) and [Data processing addendum](https://x.ai/legal/data-processing-addendum).
36+
37+
## Before you begin
38+
39+
Before users in your organization can use xAI, they need to be assigned a [Microsoft 365 Copilot license](/microsoft-365/admin/manage/assign-licenses-to-users).
40+
41+
## Connect to xAI in the Microsoft 365 Admin Center
42+
43+
Before your organization can connect to xAI AI models, you must allow access in the Microsoft 365 admin center.
44+
45+
You have to be a member of the Global administrator role to perform this task. For more information, see [About admin roles](/microsoft-365/admin/add-users/about-admin-roles) .
46+
47+
1. Go to the [Microsoft 365 admin center](https://admin.microsoft.com/) and select **Copilot** -\> **Settings**.
48+
2. On the **Settings** page, select **All**.
49+
3. Select **AI providers for other large language models**.
50+
4. Under **Available models for your organization**, choose **xAI**.
51+
5. Agree to the Terms and Conditions and select **Allow provider**.
52+
53+
After you connect, it may take a few hours for the connection to complete.
54+
55+
## Controls for Copilot Studio in the Microsoft Power Platform Admin Center
56+
57+
Once enabled in the Microsoft 365 admin center, additional administrator controls are available in the Microsoft Power Platform admin center (PPAC) to allow xAI to be used in Copilot Studio. For more information, see [Allow external large language models (LLMs) for generative responses](/power-platform/admin/allow-llm-generative-responses).
58+
59+
## Disable Connection to xAI
60+
61+
Your organization may decide that it no longer wants users to be able to access other LLMs. You can disable the model provider:
62+
63+
1. Go to the [Microsoft 365 admin center](https://admin.microsoft.com/) and select **Copilot** -\> **Settings**.
64+
2. On the **Settings** page, select **All**.
65+
3. Select **AI providers for other large language models**.
66+
4. Under **Available models for your organization**, choose **xAI**and select **Block provider**.
67+
68+
Once you disconnect xAI, users can't use xAI's AI models. After completing the steps to disconnect xAI in Microsoft 365, it may take several hours for the service to be fully disabled for your users.

copilot/copilot-control-system/overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,4 +84,4 @@ For more information, see [Microsoft 365 Copilot help & learning](https://suppor
8484
- [Management controls](management-controls.md)
8585
- [Measurement and reporting](measurement-reporting.md)
8686
- [Copilot Control System - Microsoft Adoption](https://adoption.microsoft.com/copilot/control-system/)
87-
- [Transparency note for Microsoft 365 Copilot](../microsoft-365-copilot-transparency-note.md)
87+
- [Application card: Microsoft 365 Copilot](../microsoft-365-copilot-application-card.md)

copilot/harmful-content-protection-copilot-chat.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,4 +94,4 @@ When the policy takes effect, users have the **Harmful content protection** togg
9494

9595
- [Data, Privacy, and Security for Microsoft 365 Copilot](microsoft-365-copilot-privacy.md)
9696
- [Security for Microsoft 365 Copilot](microsoft-365-copilot-ai-security.md)
97-
- [Transparency Note for Microsoft 365 Copilot](microsoft-365-copilot-transparency-note.md)
97+
- [Application card: Microsoft 365 Copilot](microsoft-365-copilot-application-card.md)

0 commit comments

Comments
 (0)