Skip to content

Commit 2c330eb

Browse files
DaniEASmithDaniEASmith
authored
Merge branch 'main' into patch-6
2 parents bb86100 + bc4f212 commit 2c330eb

345 files changed

Lines changed: 10392 additions & 2105 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.

‎.acrolinx-config.edn‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@ Select the total score link to review all feedback on clarity, consistency, tone
5151
"
5252
**More information about Acrolinx**
5353
54-
- [Install Acrolinx locally for VSCode for Magic](https://review.docs.microsoft.com/office-authoring-guide/acrolinx-vscode?branch=main)
54+
- [Install Acrolinx locally for VSCode for Magic](https://review.learn.microsoft.com/en-us/office-authoring-guide/acrolinx-vscode?branch=main)
5555
- [False positives or issues](https://aka.ms/acrolinxbug)
5656
- [Request a new Acrolinx term](https://microsoft.sharepoint.com/teams/M365Dev2/SitePages/M365-terminology.aspx)
57-
- [Troubleshooting issues with Acrolinx](https://review.docs.microsoft.com/help/contribute/acrolinx-error-messages)
57+
- [Troubleshooting issues with Acrolinx](https://review.learn.microsoft.com/en-us/help/platform/acrolinx-troubleshoot?branch=main)
5858
5959
"
6060
}

‎.github/workflows/AutoPublish.yml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,25 @@ name: (Scheduled) Publish to live
33
permissions:
44
contents: write
55
pull-requests: write
6+
checks: read
67

78
on:
89
schedule:
9-
- cron: "25 5,11,17,22 * * *" # Times are UTC based on Daylight Saving Time. Need to be adjusted for Standard Time. Scheduling at :25 to account for queuing lag.
10+
- cron: "25 2,5,8,11,14,17,20,22 * * *" # Times are UTC based on Daylight Saving Time. Need to be adjusted for Standard Time. Scheduling at :25 to account for queuing lag.
1011

1112
workflow_dispatch:
1213

1314
jobs:
1415

1516
auto-publish:
1617
if: github.repository_owner == 'MicrosoftDocs' && contains(github.event.repository.topics, 'build')
17-
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-AutoPublish.yml@workflows-prod
18+
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-AutoPublishV2.yml@workflows-prod
1819
with:
1920
PayloadJson: ${{ toJSON(github) }}
2021
EnableAutoPublish: true
22+
EnableAutoMerge: true
2123

2224
secrets:
2325
AccessToken: ${{ secrets.GITHUB_TOKEN }}
2426
PrivateKey: ${{ secrets.M365_APP_PRIVATE_KEY }}
25-
ClientId: ${{ secrets.M365_APP_CLIENT_ID }}
27+
ClientId: ${{ secrets.M365_APP_CLIENT_ID }}

‎.openpublishing.redirection.copilot.json‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
11
{
2-
"redirections":[
3-
{
2+
"redirections": [
3+
{
44
"source_path": "copilot/mutliple-account-access.md",
55
"redirect_url": "/copilot/microsoft-365/multiple-account-access",
66
"redirect_document_id": true
7-
}
8-
]
9-
}
7+
},
8+
{
9+
"source_path": "copilot/microsoft-365-copilot-search-privacy.md",
10+
"redirect_url": "/copilot/microsoft-365-copilot-search",
11+
"redirect_document_id": false
12+
}
13+
]
14+
}

‎.openpublishing.redirection.loop.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,11 @@
1414
"source_path": "microsoft-365/loop/loop-components-configuration.md",
1515
"redirect_url": "/microsoft-365/loop/loop-admin-configuration",
1616
"redirect_document_id": true
17+
},
18+
{
19+
"source_path": "microsoft-365/loop/loop-workspaces-storage-permission.md",
20+
"redirect_url": "/microsoft-365/loop/loop-storage",
21+
"redirect_document_id": true
1722
}
1823
]
1924
}

‎.openpublishing.redirection.security.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9349,6 +9349,11 @@
93499349
"source_path": "Microsoft-365/security/defender/zero-trust-with-microsoft-365-defender.md",
93509350
"redirect_url": "/defender-xdr/zero-trust-with-microsoft-365-defender",
93519351
"redirect_document_id": false
9352+
},
9353+
{
9354+
"source_path": "Microsoft-365/security/microsoft-365-zero-trust.md",
9355+
"redirect_url": "/security/zero-trust/microsoft-365-zero-trust",
9356+
"redirect_document_id": false
93529357
}
93539358
]
93549359
}

‎copilot/TOC.yml‎

Lines changed: 172 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -5,117 +5,195 @@ items:
55
href: release-notes.md
66
- name: Get started with Microsoft 365 Copilot
77
items:
8-
- name: What is Microsoft 365 Copilot?
9-
href: microsoft-365-copilot-overview.md
10-
- name: Architecture and data protection diagrams
11-
items:
12-
- name: Architecture & how Copilot works
13-
href: microsoft-365-copilot-architecture.md
14-
- name: Data protection and auditing
15-
href: microsoft-365-copilot-architecture-data-protection-auditing.md
16-
- name: Which Copilot is right for me?
17-
href: which-copilot-for-your-organization.md
18-
- name: Get your data ready for Microsoft 365 Copilot
19-
items:
20-
- name: License options
21-
href: microsoft-365-copilot-licensing.md
22-
- name: E3 and E5 license feature comparison list
23-
displayName: e3 vs e5
24-
href: microsoft-365-copilot-license-feature-overview.md
25-
- name: E3 implementation guide
26-
displayName: get started
27-
href: microsoft-365-copilot-e3-guide.md
28-
- name: E5 implementation guide
29-
displayName: get started
30-
href: microsoft-365-copilot-e5-guide.md
31-
- name: Blueprint to prevent oversharing
32-
href: microsoft-365-copilot-blueprint-oversharing.md
33-
- name: Deploy and enable Microsoft 365 Copilot
34-
items:
35-
- name: Adoption guide and overview
36-
href: microsoft-365-copilot-enablement-resources.md
8+
- name: What is Microsoft 365 Copilot?
9+
href: microsoft-365-copilot-overview.md
10+
- name: Architecture and data protection diagrams
11+
items:
12+
- name: Architecture & how Copilot works
13+
href: microsoft-365-copilot-architecture.md
14+
- name: Data protection and auditing
15+
href: microsoft-365-copilot-architecture-data-protection-auditing.md
16+
- name: Which Copilot is right for me?
17+
href: which-copilot-for-your-organization.md
18+
- name: Get your data ready for Microsoft 365 Copilot
19+
items:
3720
- name: License options
3821
href: microsoft-365-copilot-licensing.md
39-
- name: App and network requirements
40-
href: microsoft-365-copilot-requirements.md
41-
- name: Set up Copilot and assign licenses
42-
href: microsoft-365-copilot-setup.md
43-
- name: Welcome email for users
44-
href: microsoft-365-copilot-enable-users.md
22+
- name: E3 and E5 license feature comparison list
23+
displayName: e3 vs e5
24+
href: microsoft-365-copilot-license-feature-overview.md
25+
- name: E3 implementation guide
26+
displayName: get started
27+
href: microsoft-365-copilot-e3-guide.md
28+
- name: E5 implementation guide
29+
displayName: get started
30+
href: microsoft-365-copilot-e5-guide.md
31+
- name: Blueprint to prevent oversharing
32+
href: microsoft-365-copilot-blueprint-oversharing.md
33+
- name: Deploy and enable Microsoft 365 Copilot
34+
items:
35+
- name: Adoption guide and overview
36+
href: microsoft-365-copilot-enablement-resources.md
37+
- name: License options
38+
href: microsoft-365-copilot-licensing.md
39+
- name: App and network requirements
40+
href: microsoft-365-copilot-requirements.md
41+
- name: Set up Copilot and assign licenses
42+
href: microsoft-365-copilot-setup.md
43+
- name: Welcome email for users
44+
href: microsoft-365-copilot-enable-users.md
4545

4646
- name: Pay-as-you-go for Microsoft 365 Copilot
4747
items:
48-
- name: Pay-as-you-go overview
49-
href: pay-as-you-go/overview.md
50-
- name: Set up pay-as-you-go
51-
href: pay-as-you-go/setup.md
52-
- name: Meters for pay-as-you-go
53-
href: pay-as-you-go/meters.md
54-
- name: View costs and billing for pay-as-you-go
55-
href: pay-as-you-go/view-cost.md
48+
- name: Pay-as-you-go overview
49+
href: pay-as-you-go/overview.md
50+
- name: Set up pay-as-you-go
51+
href: pay-as-you-go/setup.md
52+
- name: Meters for pay-as-you-go
53+
href: pay-as-you-go/meters.md
54+
- name: View costs and billing for pay-as-you-go
55+
href: pay-as-you-go/view-cost.md
5656
- name: Manage Microsoft 365 Copilot
5757
items:
58-
- name: Manage Microsoft 365 Copilot scenarios
59-
href: microsoft-365-copilot-page.md
60-
- name: Pin Copilot Chat to the navigation bar
61-
href: pin-copilot.md
62-
- name: Copilot in Microsoft 365 admin centers
63-
href: copilot-for-microsoft-365-admin.md
64-
- name: Multiple account access for work and school documents
65-
href: multiple-account-access.md
66-
- name: Manage prompts
58+
- name: Manage Microsoft 365 Copilot scenarios
59+
href: microsoft-365-copilot-page.md
60+
- name: Set up the Microsoft 365 Copilot app
61+
items:
62+
- name: Overview and availability
63+
href: microsoft-365-copilot-app-overview.md
64+
- name: Admin settings
65+
href: microsoft-365-copilot-app-admin-settings.md
66+
- name: Set up Organizational Asset Library
67+
href: enterprise-brand-manager.md
68+
- name: Pin Copilot Chat to the navigation bar
69+
href: pin-copilot.md
70+
- name: Copilot in Microsoft 365 admin centers
71+
href: copilot-for-microsoft-365-admin.md
72+
- name: Multiple account access for work and school documents
73+
href: multiple-account-access.md
74+
- name: Manage prompts
75+
items:
76+
- name: Scheduled prompts
77+
href: scheduled-prompts.md
78+
- name: Microsoft 365 environment for scheduled prompts
79+
href: scheduled-prompts-environment.md
80+
- name: Export prompts from Copilot Prompt Gallery
81+
href: copilot-prompt-gallery-export-prompts.md
82+
- name: Inventory scheduled prompts
83+
href: scheduled-prompts-inventory.md
84+
- name: People Skills
85+
items:
86+
- name: People Skills overview
87+
href: people-skills-overview.md
88+
- name: AI inference engine
89+
href: people-skills-ai-inferencing.md
90+
- name: Setup People Skills
91+
href: people-skills-setup.md
92+
- name: Privacy and sharing controls
93+
href: people-skills-sharing-inferencing-controls.md
94+
- name: Manage People Skills library
6795
items:
68-
- name: Export prompts from Copilot Prompt Gallery
69-
href: copilot-prompt-gallery-export-prompts.md
70-
- name: Scheduled prompts
71-
href: scheduled-prompts.md
96+
- name: Manage People Skills
97+
href: people-skills-manage-skills-library.md
98+
- name: Manage custom skills
99+
href: people-skills-manage-custom-skill.md
100+
- name: Manage AI restricted skills
101+
href: people-skills-manage-ai-restricted-skills.md
102+
- name: People Skills import and export
103+
href: people-skills-import-export-skills.md
104+
- name: People skills data and AI guidelines
105+
href: people-skills-data-and-ai-guidelines.md
106+
- name: Microsoft 365 Copilot Search
107+
items:
108+
- name: Overview of Microsoft 365 Copilot Search
109+
href: microsoft-365-copilot-search.md
110+
- name: Manage Microsoft 365 Copilot Search
111+
href: microsoft-365-copilot-search-manage.md
112+
- name: Microsoft 365 Copilot Search admin experience
113+
href: microsoft-365-copilot-search-admin-experience.md
72114
- name: Microsoft 365 Copilot in Microsoft Teams
73115
items:
74-
- name: Overview of AI in Microsoft Teams
75-
href: /microsoftteams/copilot-ai-agents-overview?toc=%2Fcopilot%2Fmicrosoft-365%2Ftoc.json&bc=%2Fcopilot%2Fmicrosoft-365%2Fbreadcrumb%2Ftoc.json
76-
- name: Set up Facilitator in Microsoft Teams
77-
href: /microsoftteams/facilitator-teams?toc=%2Fcopilot%2Fmicrosoft-365%2Ftoc.json&bc=%2Fcopilot%2Fmicrosoft-365%2Fbreadcrumb%2Ftoc.json
78-
- name: Manage Copilot for Microsoft Teams meetings and events
79-
href: /microsoftteams/copilot-teams-transcription?toc=%2Fcopilot%2Fmicrosoft-365%2Ftoc.json&bc=%2Fmicrosoft-365-copilot%2Fbreadcrumb%2Ftoc.json
116+
- name: Overview of AI in Microsoft Teams
117+
href: /microsoftteams/copilot-ai-agents-overview?toc=%2Fcopilot%2Fmicrosoft-365%2Ftoc.json&bc=%2Fcopilot%2Fmicrosoft-365%2Fbreadcrumb%2Ftoc.json
118+
- name: Set up Facilitator in Microsoft Teams
119+
href: /microsoftteams/facilitator-teams?toc=%2Fcopilot%2Fmicrosoft-365%2Ftoc.json&bc=%2Fcopilot%2Fmicrosoft-365%2Fbreadcrumb%2Ftoc.json
120+
- name: Manage Copilot for Microsoft Teams meetings and events
121+
href: /microsoftteams/copilot-teams-transcription?toc=%2Fcopilot%2Fmicrosoft-365%2Ftoc.json&bc=%2Fmicrosoft-365-copilot%2Fbreadcrumb%2Ftoc.json
80122
- name: Microsoft 365 Copilot in Microsoft Viva
81123
items:
82-
- name: Introduction to Microsoft 365 Copilot in Viva
83-
href: /viva/copilot/viva-copilot-overview?toc=%2Fcopilot%2Fmicrosoft-365%2Ftoc.json&bc=%2Fcopilot%2Fmicrosoft-365%2Fbreadcrumb%2Ftoc.json
84-
- name: Manage access to Microsoft 365 Copilot in Viva
85-
href: /viva/copilot/copilot-access-management?toc=%2Fcopilot%2Fmicrosoft-365%2Ftoc.json&bc=%2Fcopilot%2Fmicrosoft-365%2Fbreadcrumb%2Ftoc.json
124+
- name: Introduction to Microsoft 365 Copilot in Viva
125+
href: /viva/copilot/viva-copilot-overview?toc=%2Fcopilot%2Fmicrosoft-365%2Ftoc.json&bc=%2Fcopilot%2Fmicrosoft-365%2Fbreadcrumb%2Ftoc.json
126+
- name: Manage access to Microsoft 365 Copilot in Viva
127+
href: /viva/copilot/copilot-access-management?toc=%2Fcopilot%2Fmicrosoft-365%2Ftoc.json&bc=%2Fcopilot%2Fmicrosoft-365%2Fbreadcrumb%2Ftoc.json
86128
- name: Maximize the value of Microsoft 365 Copilot
87129
items:
88-
- name: Reports and insights
89-
href: microsoft-365-copilot-reports-for-admins.md
90-
- name: Copilot Prompt Gallery
91-
href: copilot-prompt-gallery.md
92-
- name: Service plan diagnostic tool
93-
href: microsoft-365-copilot-service-plans.md
130+
- name: Reports and insights
131+
href: microsoft-365-copilot-reports-for-admins.md
132+
- name: Copilot Prompt Gallery
133+
href: copilot-prompt-gallery.md
134+
- name: Service plan diagnostic tool
135+
href: microsoft-365-copilot-service-plans.md
94136
- name: "Trust: Data, Privacy, and Security"
95137
items:
96-
- name: Data, privacy, and security for Microsoft 365 Copilot
97-
href: microsoft-365-copilot-privacy.md
98-
- name: Data, privacy, and security for web search in Microsoft 365 Copilot and Microsoft 365 Copilot Chat
99-
href: manage-public-web-access.md
100-
- name: AI security for Microsoft 365 Copilot
101-
href: microsoft-365-copilot-ai-security.md
102-
- name: Apply principles of Zero Trust to Microsoft 365 Copilot
103-
href: /security/zero-trust/zero-trust-microsoft-365-copilot?toc=%2Fcopilot%2Fmicrosoft-365%2Ftoc.json&bc=%2Fcopilot%2Fmicrosoft-365%2Fbreadcrumb%2Ftoc.json
104-
- name: Enterprise data protection
105-
href: enterprise-data-protection.md
106-
- name: Transparency Note
107-
href: microsoft-365-copilot-transparency-note.md
138+
- name: Data, privacy, and security for Microsoft 365 Copilot
139+
href: microsoft-365-copilot-privacy.md
140+
- name: Data, privacy, and security for web search in Microsoft 365 Copilot and Microsoft 365 Copilot Chat
141+
href: manage-public-web-access.md
142+
- name: AI security for Microsoft 365 Copilot
143+
href: microsoft-365-copilot-ai-security.md
144+
- name: Apply principles of Zero Trust to Microsoft 365 Copilot
145+
href: /security/zero-trust/zero-trust-microsoft-365-copilot?toc=%2Fcopilot%2Fmicrosoft-365%2Ftoc.json&bc=%2Fcopilot%2Fmicrosoft-365%2Fbreadcrumb%2Ftoc.json
146+
- name: Enterprise data protection
147+
href: enterprise-data-protection.md
148+
- name: Transparency Note
149+
href: microsoft-365-copilot-transparency-note.md
108150
- name: Extensibility and building agents
109151
items:
110-
- name: Extend Microsoft 365 Copilot
111-
href: /microsoft-365-copilot/extensibility?toc=%2Fcopilot%2Fmicrosoft-365%2Ftoc.json&bc=%2Fcopilot%2Fmicrosoft-365%2Fbreadcrumb%2Ftoc.json
152+
- name: Extend Microsoft 365 Copilot
153+
href: /microsoft-365-copilot/extensibility?toc=%2Fcopilot%2Fmicrosoft-365%2Ftoc.json&bc=%2Fcopilot%2Fmicrosoft-365%2Fbreadcrumb%2Ftoc.json
154+
- name: Install agents in Microsoft 365 Copilot
155+
href: copilot-agent-install.md
156+
- name: Microsoft 365 Copilot Tuning (preview)
157+
items:
158+
- name: Overview
159+
href: copilot-tuning-overview.md
160+
- name: Tuning process
161+
href: copilot-tuning-process.md
162+
- name: FAQ
163+
href: copilot-tuning-faq.yml
164+
- name: Admin guide
165+
href: copilot-tuning-admin-guide.md
166+
- name: Knowledge selection
167+
href: copilot-tuning-knowledge-selection.md
168+
- name: Fine-tune models
169+
href: /microsoft-copilot-studio/microsoft-copilot-fine-tune-model?branch=tenant-fine-tuning?toc=%2Fcopilot%2Fmicrosoft-365%2Ftoc.json&bc=%2Fcopilot%2Fmicrosoft-365%2Fbreadcrumb%2Ftoc.json
170+
- name: Task-specific guides
171+
items:
172+
- name: Document generation
173+
href: copilot-tuning-doc-generation.md
174+
- name: Expert Q&A
175+
href: copilot-tuning-expert-qa.md
176+
- name: Summarization
177+
href: copilot-tuning-summarization.md
178+
- name: Troubleshooting
179+
items:
180+
- name: Document generation
181+
href: copilot-tuning-troubleshooting-doc-generation.md
182+
- name: Expert Q&A
183+
href: copilot-tuning-troubleshooting-expert-qa.md
184+
- name: Guardrails
185+
href: copilot-tuning-troubleshooting-guardrails.md
186+
- name: Microsoft 365 admin center
187+
href: copilot-tuning-troubleshooting-mac.md
188+
- name: Responsible AI FAQ
189+
href: copilot-tuning-responsible-ai-faq.md
112190
- name: Service description and training for Microsoft 365 Copilot
113191
items:
114-
- name: Service description
115-
href: /office365/servicedescriptions/office-365-platform-service-description/microsoft-365-copilot?toc=%2Fcopilot%2Fmicrosoft-365%2Ftoc.json&bc=%2Fcopilot%2Fmicrosoft-365%2Fbreadcrumb%2Ftoc.json
116-
- name: Technical training
117-
href: /training/paths/prepare-your-organization-microsoft-365-copilot/
118-
- name: "Copilot: End user resources"
119-
href: https://copilot.cloud.microsoft/prompts
120-
- name: Submit Copilot feedback to Microsoft
121-
href: provide-feedback.md
192+
- name: Service description
193+
href: /office365/servicedescriptions/office-365-platform-service-description/microsoft-365-copilot?toc=%2Fcopilot%2Fmicrosoft-365%2Ftoc.json&bc=%2Fcopilot%2Fmicrosoft-365%2Fbreadcrumb%2Ftoc.json
194+
- name: Technical training
195+
href: /training/paths/prepare-your-organization-microsoft-365-copilot/
196+
- name: "Copilot: End user resources"
197+
href: https://copilot.cloud.microsoft/prompts
198+
- name: Submit Copilot feedback to Microsoft
199+
href: provide-feedback.md

0 commit comments

Comments
 (0)