Skip to content

Commit 21ea262

Browse files
authored
Merge branch 'public' into patch-1
2 parents 7b46c52 + 0b467a2 commit 21ea262

673 files changed

Lines changed: 129476 additions & 8742 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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ For more information about the exception criteria and exception process, see [Mi
3939
4040
Select the total score link to review all feedback on clarity, consistency, tone, brand, terms, spelling, grammar, readability, and inclusive language. _You should fix all spelling errors regardless of your total score_. Fixing spelling errors helps maintain customer trust in overall content quality.
4141
42-
| Article | Total score<br>(Required: 80) | Words + phrases<br>(Brand, terms) | Correctness<br>(Spelling, grammar) | Clarity<br>(Readability) |
42+
| Article | Total score<br>(Required: 80) | Terminology | Spelling and Grammar | Clarity<br>(Readability) |
4343
|---------|:--------------:|:--------------------:|:------:|:---------:|
4444
"
4545

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
name: PR has no warnings or errors
2+
3+
permissions:
4+
pull-requests: write
5+
statuses: write
6+
7+
on:
8+
issue_comment:
9+
types: [created]
10+
11+
jobs:
12+
13+
build-status:
14+
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-BuildValidation.yml@workflows-prod
15+
with:
16+
PayloadJson: ${{ toJSON(github) }}
17+
secrets:
18+
AccessToken: ${{ secrets.GITHUB_TOKEN }}
19+
20+
21+

.openpublishing.publish.config.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -113,21 +113,22 @@
113113
".openpublishing.redirection.commerce.json",
114114
".openpublishing.redirection.compliance.json",
115115
".openpublishing.redirection.contentunderstanding.json",
116+
".openpublishing.redirection.copilot.json",
117+
".openpublishing.redirection.defender.json",
116118
".openpublishing.redirection.enterprise.json",
117119
".openpublishing.redirection.frontline.json",
118120
".openpublishing.redirection.knowledge.json",
119121
".openpublishing.redirection.learning.json",
120122
".openpublishing.redirection.lighthouse.json",
121123
".openpublishing.redirection.loop.json",
124+
".openpublishing.redirection.lti.json",
122125
".openpublishing.redirection.managed-desktop.json",
126+
".openpublishing.redirection.scheduler.json",
123127
".openpublishing.redirection.security.json",
124128
".openpublishing.redirection.solutions.json",
125129
".openpublishing.redirection.syntex.json",
126-
".openpublishing.redirection.topics.json",
127-
".openpublishing.redirection.lti.json",
128-
".openpublishing.redirection.viva.json",
129130
".openpublishing.redirection.test-base.json",
130-
".openpublishing.redirection.scheduler.json",
131-
".openpublishing.redirection.defender.json"
131+
".openpublishing.redirection.topics.json",
132+
".openpublishing.redirection.viva.json"
132133
]
133134
}

.openpublishing.redirection.admin.json

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2189,6 +2189,16 @@
21892189
"source_path": "microsoft-365/admin/admin-overview/what-is-microsoft-365.md",
21902190
"redirect_url": "/microsoft-365/business-premium/m365bp-overview",
21912191
"redirect_document_id": false
2192-
}
2192+
},
2193+
{
2194+
"source_path": "microsoft-365/admin/activity-reports/agent-usage.md",
2195+
"redirect_url": "/microsoft-365/admin/activity-reports/microsoft-365-copilot-agents",
2196+
"redirect_document_id": true
2197+
},
2198+
{
2199+
"source_path": "microsoft-365/admin/misc/places-ios-mobile.md",
2200+
"redirect_url": "/microsoft-365/admin/",
2201+
"redirect_document_id": false
2202+
}
21932203
]
21942204
}

.openpublishing.redirection.commerce.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -954,6 +954,11 @@
954954
"source_path": "microsoft-365/commerce/licenses/downloads-faq.yml",
955955
"redirect_url": "/microsoft-365/commerce/licenses/download-vl-products",
956956
"redirect_document_id": false
957+
},
958+
{
959+
"source_path": "microsoft-365/commerce/licenses/product-keys-faq.yml",
960+
"redirect_url": "/microsoft-365/commerce/licenses/product-keys-for-vl",
961+
"redirect_document_id": false
957962
}
958963
]
959964
}
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"redirections":[
3+
{
4+
"source_path": "copilot/mutliple-account-access.md",
5+
"redirect_url": "/copilot/microsoft-365/multiple-account-access",
6+
"redirect_document_id": true
7+
}
8+
]
9+
}

.openpublishing.redirection.loop.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@
44
"source_path": "microsoft-365/loop/loop-components-sharepoint.md",
55
"redirect_url": "/microsoft-365/loop/loop-workspaces-configuration",
66
"redirect_document_id": true
7+
},
8+
{
9+
"source_path": "microsoft-365/loop/loop-workspaces-configuration.md",
10+
"redirect_url": "/microsoft-365/loop/loop-components-configuration",
11+
"redirect_document_id": true
712
}
813
]
914
}

.openpublishing.redirection.syntex.json

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,12 @@
154154
"source_path":"microsoft-365/backup/backup-limitations.md",
155155
"redirect_url":"/microsoft-365/backup/backup-faq",
156156
"redirect_document_id":true
157+
},
158+
{
159+
"source_path":"microsoft-365/syntex/feature-limited-license.md",
160+
"redirect_url":"/microsoft-365/syntex/syntex-licensing",
161+
"redirect_document_id":true
157162
}
158-
]
159-
}
163+
]
164+
}
165+

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Anyone who is interested can contribute to the articles. When you contribute, yo
1010

1111
### Quickly update an article using GitHub.com
1212

13-
Contributors who make infrequent or small updates can edit the file directly on GitHub.com without installing any software. This article shows you how. [This two-minute video](https://www.microsoft.com/videoplayer/embed/RE1XQTG) also covers how to contribute.
13+
Contributors who make infrequent or small updates can edit the file directly on GitHub.com without installing any software. This article shows you how. [This two-minute video](https://learn-video.azurefd.net/vod/player?id=b5167c5a-9c69-499b-99ac-e5467882bc92) also covers how to contribute.
1414

1515
> [!TIP]
1616
> To edit an article, you need to get to it on the GitHub.com backend. If you're already on the GitHub.com page of the article, you're starting at step 4.

copilot/TOC.yml

Lines changed: 92 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,97 @@
1+
items:
12
- name: Microsoft 365 Copilot documentation
23
href: index.yml
4+
- name: Copilot release notes
5+
href: release-notes.md
6+
- name: Get started with Microsoft 365 Copilot
37
items:
4-
- name: Get started
8+
- name: Overview
9+
href: microsoft-365-copilot-overview.md
10+
- name: Architecture and data protection diagrams
511
items:
6-
- name: Overview of Microsoft 365 Copilot
7-
href: microsoft-365-copilot-overview.md
8-
- name: Set up Microsoft 365 Copilot
9-
href: microsoft-365-copilot-setup.md
10-
- name: Deploy and enable
11-
items:
12-
- name: Requirements for Microsoft 365 Copilot
13-
href: microsoft-365-copilot-requirements.md
14-
- name: Understand licensing for Microsoft 365 Copilot
15-
href: microsoft-365-copilot-licensing.md
16-
- name: Adoption resources
17-
href: microsoft-365-copilot-enablement-resources.md
18-
- name: Enable users for Microsoft 365 Copilot
19-
href: microsoft-365-copilot-enable-users.md
20-
- name: Manage
21-
items:
22-
- name: Manage Microsoft 365 Copilot settings
23-
href: microsoft-365-copilot-page.md
24-
- name: Viva Insights Copilot Dashboard
25-
href: /viva/insights/org-team-insights/copilot-dashboard?toc=%2Fcopilot%2Fmicrosoft-365%2Ftoc.json&bc=%2Fcopilot%2Fmicrosoft-365%2Fbreadcrumb%2Ftoc.json
26-
- name: Microsoft 365 Copilot readiness report
27-
href: /microsoft-365/admin/activity-reports/microsoft-365-copilot-readiness?toc=%2Fcopilot%2Fmicrosoft-365%2Ftoc.json&bc=%2Fcopilot%2Fmicrosoft-365%2Fbreadcrumb%2Ftoc.json
28-
- name: Microsoft 365 Copilot usage report
29-
href: /microsoft-365/admin/activity-reports/microsoft-365-copilot-usage?toc=%2Fcopilot%2Fmicrosoft-365%2Ftoc.json&bc=%2Fcopilot%2Fmicrosoft-365%2Fbreadcrumb%2Ftoc.json
30-
- name: Pin Microsoft Copilot to the navigation bar
31-
href: pin-copilot.md
32-
- name: Manage Copilot for Microsoft Teams meetings and events
33-
href: /microsoftteams/copilot-teams-transcription?toc=%2Fcopilot%2Fmicrosoft-365%2Ftoc.json&bc=%2Fmicrosoft-365-copilot%2Fbreadcrumb%2Ftoc.json
34-
- name: Set up Copilot in Viva Engage
35-
href: /viva/engage/configure-copilot-for-engage?toc=%2Fcopilot%2Fmicrosoft-365%2Ftoc.json&bc=%2Fcopilot%2Fmicrosoft-365%2Fbreadcrumb%2Ftoc.json
36-
- name: Enable Copilot in Viva Goals
37-
href: /viva/goals/copilot-intro?toc=%2Fcopilot%2Fmicrosoft-365%2Ftoc.json&bc=%2Fcopilot%2Fmicrosoft-365%2Fbreadcrumb%2Ftoc.json
38-
- name: "Trust: Data, Privacy, and Security"
39-
items:
40-
- name: Data, privacy, and security for Microsoft 365 Copilot
41-
href: microsoft-365-copilot-privacy.md
42-
- name: Data, privacy, and security for web queries in Microsoft 365 Copilot and Microsoft Copilot
43-
href: manage-public-web-access.md
44-
- name: AI security for Microsoft 365 Copilot
45-
href: microsoft-365-copilot-ai-security.md
46-
- name: Apply principles of Zero Trust to Microsoft 365 Copilot
47-
href: /security/zero-trust/zero-trust-microsoft-365-copilot?toc=%2Fcopilot%2Fmicrosoft-365%2Ftoc.json&bc=%2Fcopilot%2Fmicrosoft-365%2Fbreadcrumb%2Ftoc.json
48-
- name: Enterprise data protection
49-
href: enterprise-data-protection.md
50-
- name: Transparency Note
51-
href: microsoft-365-copilot-transparency-note.md
52-
- name: Extend and build
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: Select your Copilot
17+
href: which-copilot-for-your-organization.md
18+
- name: Get your data ready for Microsoft 365 Copilot
5319
items:
54-
- name: Extend Microsoft 365 Copilot
55-
href: /microsoft-365-copilot/extensibility?toc=%2Fcopilot%2Fmicrosoft-365%2Ftoc.json&bc=%2Fcopilot%2Fmicrosoft-365%2Fbreadcrumb%2Ftoc.json
56-
- name: Resources
57-
items:
58-
- name: Service description
59-
href: /office365/servicedescriptions/office-365-platform-service-description/microsoft-365-copilot?toc=%2Fcopilot%2Fmicrosoft-365%2Ftoc.json&bc=%2Fcopilot%2Fmicrosoft-365%2Fbreadcrumb%2Ftoc.json
60-
- name: Technical training for Microsoft 365 Copilot
61-
href: /training/paths/prepare-your-organization-microsoft-365-copilot/
62-
- name: "Copilot lab: End user resources"
63-
href: https://copilot.cloud.microsoft/prompts
64-
- name: Submit Copilot feedback to Microsoft
65-
href: provide-feedback.md
20+
- name: License options
21+
href: microsoft-365-copilot-licensing.md
22+
- name: License feature comparison list
23+
href: microsoft-365-copilot-license-feature-overview.md
24+
- name: E3 implementation guide
25+
href: microsoft-365-copilot-e3-guide.md
26+
- name: E5 implementation guide
27+
href: microsoft-365-copilot-e5-guide.md
28+
- name: Blueprint to prevent oversharing
29+
href: microsoft-365-copilot-blueprint-oversharing.md
30+
- name: Deploy and enable Microsoft 365 Copilot
31+
items:
32+
- name: Set up and assign licenses
33+
href: microsoft-365-copilot-setup.md
34+
- name: Requirements and prerequisites
35+
href: microsoft-365-copilot-requirements.md
36+
- name: License add-on list
37+
href: microsoft-365-copilot-licensing.md
38+
- name: Enable users and welcome email
39+
href: microsoft-365-copilot-enable-users.md
40+
- name: Copilot Prompt Gallery
41+
href: copilot-prompt-gallery.md
42+
- name: Adoption resources
43+
href: microsoft-365-copilot-enablement-resources.md
44+
- name: Manage Microsoft 365 Copilot
45+
items:
46+
- name: Manage Microsoft 365 Copilot settings
47+
href: microsoft-365-copilot-page.md
48+
- name: Pin Copilot Chat to the navigation bar
49+
href: pin-copilot.md
50+
- name: Enable Facilitator in Microsoft Teams
51+
href: /microsoftteams/facilitator-teams?toc=%2Fcopilot%2Fmicrosoft-365%2Ftoc.json&bc=%2Fcopilot%2Fmicrosoft-365%2Fbreadcrumb%2Ftoc.json
52+
- name: Manage Copilot for Microsoft Teams meetings and events
53+
href: /microsoftteams/copilot-teams-transcription?toc=%2Fcopilot%2Fmicrosoft-365%2Ftoc.json&bc=%2Fmicrosoft-365-copilot%2Fbreadcrumb%2Ftoc.json
54+
- name: Copilot in Microsoft 365 admin centers
55+
href: copilot-for-microsoft-365-admin.md
56+
- name: Microsoft 365 Copilot in Microsoft Viva
57+
items:
58+
- name: Introduction to Microsoft 365 Copilot in Viva
59+
href: /viva/copilot/viva-copilot-overview?toc=%2Fcopilot%2Fmicrosoft-365%2Ftoc.json&bc=%2Fcopilot%2Fmicrosoft-365%2Fbreadcrumb%2Ftoc.json
60+
- name: Manage access to Microsoft 365 Copilot in Viva
61+
href: /viva/copilot/copilot-access-management?toc=%2Fcopilot%2Fmicrosoft-365%2Ftoc.json&bc=%2Fcopilot%2Fmicrosoft-365%2Fbreadcrumb%2Ftoc.json
62+
- name: Maximize the value of Microsoft 365 Copilot for your organization
63+
items:
64+
- name: Use the Microsoft Copilot Dashboard
65+
href: /viva/insights/org-team-insights/copilot-dashboard?toc=%2Fcopilot%2Fmicrosoft-365%2Ftoc.json&bc=%2Fcopilot%2Fmicrosoft-365%2Fbreadcrumb%2Ftoc.json
66+
- name: View the Microsoft 365 Copilot readiness report
67+
href: /microsoft-365/admin/activity-reports/microsoft-365-copilot-readiness?toc=%2Fcopilot%2Fmicrosoft-365%2Ftoc.json&bc=%2Fcopilot%2Fmicrosoft-365%2Fbreadcrumb%2Ftoc.json
68+
- name: View the Microsoft 365 Copilot usage report
69+
href: /microsoft-365/admin/activity-reports/microsoft-365-copilot-usage?toc=%2Fcopilot%2Fmicrosoft-365%2Ftoc.json&bc=%2Fcopilot%2Fmicrosoft-365%2Fbreadcrumb%2Ftoc.json
70+
- name: "Trust: Data, Privacy, and Security"
71+
items:
72+
- name: Data, privacy, and security for Microsoft 365 Copilot
73+
href: microsoft-365-copilot-privacy.md
74+
- name: Data, privacy, and security for web search in Microsoft 365 Copilot and Microsoft 365 Copilot Chat
75+
href: manage-public-web-access.md
76+
- name: AI security for Microsoft 365 Copilot
77+
href: microsoft-365-copilot-ai-security.md
78+
- name: Apply principles of Zero Trust to Microsoft 365 Copilot
79+
href: /security/zero-trust/zero-trust-microsoft-365-copilot?toc=%2Fcopilot%2Fmicrosoft-365%2Ftoc.json&bc=%2Fcopilot%2Fmicrosoft-365%2Fbreadcrumb%2Ftoc.json
80+
- name: Enterprise data protection
81+
href: enterprise-data-protection.md
82+
- name: Transparency Note
83+
href: microsoft-365-copilot-transparency-note.md
84+
- name: Extensibility and building agents
85+
items:
86+
- name: Extend Microsoft 365 Copilot
87+
href: /microsoft-365-copilot/extensibility?toc=%2Fcopilot%2Fmicrosoft-365%2Ftoc.json&bc=%2Fcopilot%2Fmicrosoft-365%2Fbreadcrumb%2Ftoc.json
88+
- name: Service description and training for Microsoft 365 Copilot
89+
items:
90+
- name: Service description
91+
href: /office365/servicedescriptions/office-365-platform-service-description/microsoft-365-copilot?toc=%2Fcopilot%2Fmicrosoft-365%2Ftoc.json&bc=%2Fcopilot%2Fmicrosoft-365%2Fbreadcrumb%2Ftoc.json
92+
- name: Technical training
93+
href: /training/paths/prepare-your-organization-microsoft-365-copilot/
94+
- name: "Copilot: End user resources"
95+
href: https://copilot.cloud.microsoft/prompts
96+
- name: Submit Copilot feedback to Microsoft
97+
href: provide-feedback.md

0 commit comments

Comments
 (0)