Skip to content

Commit cdbf939

Browse files
authored
Merge branch 'public' into patch-1
2 parents f54094f + a7a6b13 commit cdbf939

File tree

479 files changed

+20016
-19834
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

479 files changed

+20016
-19834
lines changed

.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: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2194,6 +2194,11 @@
21942194
"source_path": "microsoft-365/admin/activity-reports/agent-usage.md",
21952195
"redirect_url": "/microsoft-365/admin/activity-reports/microsoft-365-copilot-agents",
21962196
"redirect_document_id": true
2197-
}
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+
}
21982203
]
21992204
}

.openpublishing.redirection.commerce.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -959,6 +959,11 @@
959959
"source_path": "microsoft-365/commerce/licenses/product-keys-faq.yml",
960960
"redirect_url": "/microsoft-365/commerce/licenses/product-keys-for-vl",
961961
"redirect_document_id": false
962+
},
963+
{
964+
"source_path": "microsoft-365/commerce/licenses/manage-license-requests-faq.yml",
965+
"redirect_url": "/microsoft-365/commerce/licenses/manage-license-reservations-vl",
966+
"redirect_document_id": false
962967
}
963968
]
964969
}
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.lti.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@
99
"source_path": "microsoft-365/lti/use-onedrive-with-lms.md",
1010
"redirect_url": "/lti/onedrive-lti",
1111
"redirect_document_id": false
12+
},
13+
{
14+
"source_path": "microsoft-365/lti/assignments-lti-license-terms.md",
15+
"redirect_url": "/lti/index",
16+
"redirect_document_id": false
1217
}
1318
]
14-
}
19+
}

.openpublishing.redirection.syntex.json

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,22 @@
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
162+
},
163+
{
164+
"source_path":"microsoft-365/syntex/train-model.md",
165+
"redirect_url":"/microsoft-365/syntex/syntex-overview",
166+
"redirect_document_id":true
167+
},
168+
{
169+
"source_path":"microsoft-365/syntex/video-library.md",
170+
"redirect_url":"/microsoft-365/syntex/unstructured-setup",
171+
"redirect_document_id":true
157172
}
158-
]
159-
}
173+
]
174+
}
175+

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: 36 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,42 @@
1+
items:
12
- name: Microsoft 365 Copilot documentation
23
href: index.yml
34
- name: Copilot release notes
45
href: release-notes.md
56
- name: Get started with Microsoft 365 Copilot
67
items:
7-
- name: Overview
8+
- name: What is Microsoft 365 Copilot?
89
href: microsoft-365-copilot-overview.md
9-
- name: Architecture & how Copilot works
10-
href: microsoft-365-copilot-architecture.md
11-
- name: Data protection and auditing
12-
href: microsoft-365-copilot-architecture-data-protection-auditing.md
13-
- name: Blueprint to prevent oversharing
14-
href: microsoft-365-copilot-blueprint-oversharing.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
1518
- name: Get your data ready for Microsoft 365 Copilot
1619
items:
1720
- name: License options
1821
href: microsoft-365-copilot-licensing.md
19-
- name: License feature comparison list
22+
- name: E3 and E5 license feature comparison list
23+
displayName: e3 vs e5
2024
href: microsoft-365-copilot-license-feature-overview.md
2125
- name: E3 implementation guide
26+
displayName: get started
2227
href: microsoft-365-copilot-e3-guide.md
2328
- name: E5 implementation guide
29+
displayName: get started
2430
href: microsoft-365-copilot-e5-guide.md
31+
- name: Blueprint to prevent oversharing
32+
href: microsoft-365-copilot-blueprint-oversharing.md
2533
- name: Deploy and enable Microsoft 365 Copilot
2634
items:
2735
- name: Set up and assign licenses
2836
href: microsoft-365-copilot-setup.md
2937
- name: Requirements and prerequisites
3038
href: microsoft-365-copilot-requirements.md
31-
- name: License add-on list
39+
- name: License options
3240
href: microsoft-365-copilot-licensing.md
3341
- name: Enable users and welcome email
3442
href: microsoft-365-copilot-enable-users.md
@@ -38,31 +46,35 @@
3846
href: microsoft-365-copilot-enablement-resources.md
3947
- name: Manage Microsoft 365 Copilot
4048
items:
41-
- name: Manage Microsoft 365 Copilot settings
49+
- name: Manage Microsoft 365 Copilot scenarios
4250
href: microsoft-365-copilot-page.md
43-
- name: Pin Microsoft Copilot to the navigation bar
51+
- name: Pin Copilot Chat to the navigation bar
4452
href: pin-copilot.md
4553
- name: Enable Facilitator in Microsoft Teams
4654
href: /microsoftteams/facilitator-teams?toc=%2Fcopilot%2Fmicrosoft-365%2Ftoc.json&bc=%2Fcopilot%2Fmicrosoft-365%2Fbreadcrumb%2Ftoc.json
4755
- name: Manage Copilot for Microsoft Teams meetings and events
4856
href: /microsoftteams/copilot-teams-transcription?toc=%2Fcopilot%2Fmicrosoft-365%2Ftoc.json&bc=%2Fmicrosoft-365-copilot%2Fbreadcrumb%2Ftoc.json
49-
- name: Viva and Microsoft 365 Copilot usage
50-
items:
51-
- name: Viva Insights Copilot Dashboard
52-
href: /viva/insights/org-team-insights/copilot-dashboard?toc=%2Fcopilot%2Fmicrosoft-365%2Ftoc.json&bc=%2Fcopilot%2Fmicrosoft-365%2Fbreadcrumb%2Ftoc.json
53-
- name: Set up Copilot in Viva Engage
54-
href: /viva/engage/configure-copilot-for-engage?toc=%2Fcopilot%2Fmicrosoft-365%2Ftoc.json&bc=%2Fcopilot%2Fmicrosoft-365%2Fbreadcrumb%2Ftoc.json
55-
- name: Enable Copilot in Viva Goals
56-
href: /viva/goals/copilot-intro?toc=%2Fcopilot%2Fmicrosoft-365%2Ftoc.json&bc=%2Fcopilot%2Fmicrosoft-365%2Fbreadcrumb%2Ftoc.json
57-
- name: Microsoft 365 Copilot readiness report
58-
href: /microsoft-365/admin/activity-reports/microsoft-365-copilot-readiness?toc=%2Fcopilot%2Fmicrosoft-365%2Ftoc.json&bc=%2Fcopilot%2Fmicrosoft-365%2Fbreadcrumb%2Ftoc.json
59-
- name: Microsoft 365 Copilot usage report
60-
href: /microsoft-365/admin/activity-reports/microsoft-365-copilot-usage?toc=%2Fcopilot%2Fmicrosoft-365%2Ftoc.json&bc=%2Fcopilot%2Fmicrosoft-365%2Fbreadcrumb%2Ftoc.json
57+
- name: Copilot in Microsoft 365 admin centers
58+
href: copilot-for-microsoft-365-admin.md
59+
- name: Microsoft 365 Copilot in Microsoft Viva
60+
items:
61+
- name: Introduction to Microsoft 365 Copilot in Viva
62+
href: /viva/copilot/viva-copilot-overview?toc=%2Fcopilot%2Fmicrosoft-365%2Ftoc.json&bc=%2Fcopilot%2Fmicrosoft-365%2Fbreadcrumb%2Ftoc.json
63+
- name: Manage access to Microsoft 365 Copilot in Viva
64+
href: /viva/copilot/copilot-access-management?toc=%2Fcopilot%2Fmicrosoft-365%2Ftoc.json&bc=%2Fcopilot%2Fmicrosoft-365%2Fbreadcrumb%2Ftoc.json
65+
- name: Maximize the value of Microsoft 365 Copilot for your organization
66+
items:
67+
- name: Use the Microsoft Copilot Dashboard
68+
href: /viva/insights/org-team-insights/copilot-dashboard?toc=%2Fcopilot%2Fmicrosoft-365%2Ftoc.json&bc=%2Fcopilot%2Fmicrosoft-365%2Fbreadcrumb%2Ftoc.json
69+
- name: View the Microsoft 365 Copilot readiness report
70+
href: /microsoft-365/admin/activity-reports/microsoft-365-copilot-readiness?toc=%2Fcopilot%2Fmicrosoft-365%2Ftoc.json&bc=%2Fcopilot%2Fmicrosoft-365%2Fbreadcrumb%2Ftoc.json
71+
- name: View the Microsoft 365 Copilot usage report
72+
href: /microsoft-365/admin/activity-reports/microsoft-365-copilot-usage?toc=%2Fcopilot%2Fmicrosoft-365%2Ftoc.json&bc=%2Fcopilot%2Fmicrosoft-365%2Fbreadcrumb%2Ftoc.json
6173
- name: "Trust: Data, Privacy, and Security"
6274
items:
6375
- name: Data, privacy, and security for Microsoft 365 Copilot
6476
href: microsoft-365-copilot-privacy.md
65-
- name: Data, privacy, and security for web queries in Microsoft 365 Copilot and Microsoft Copilot
77+
- name: Data, privacy, and security for web search in Microsoft 365 Copilot and Microsoft 365 Copilot Chat
6678
href: manage-public-web-access.md
6779
- name: AI security for Microsoft 365 Copilot
6880
href: microsoft-365-copilot-ai-security.md

0 commit comments

Comments
 (0)